diff --git a/Jakefile.js b/Jakefile.js
index 777068c556f..2e02cfdb511 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -256,7 +256,7 @@ var harnessSources = harnessCoreSources.concat([
     "commandLineParsing.ts",
     "configurationExtension.ts",
     "convertCompilerOptionsFromJson.ts",
-    "convertTypingOptionsFromJson.ts",
+    "convertTypeAcquisitionFromJson.ts",
     "tsserverProjectSystem.ts",
     "compileOnSave.ts",
     "typingsInstaller.ts",
@@ -931,7 +931,7 @@ function runConsoleTests(defaultReporter, runInParallel) {
     }
 
     if (tests && tests.toLocaleLowerCase() === "rwc") {
-        testTimeout = 400000;
+        testTimeout = 800000;
     }
 
     colors = process.env.colors || process.env.color;
@@ -1087,12 +1087,10 @@ 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 () {
-    acceptBaseline("");
+    acceptBaseline(localBaseline, refBaseline);
 });
 
-function acceptBaseline(containerFolder) {
-    var sourceFolder = path.join(localBaseline, containerFolder);
-    var targetFolder = path.join(refBaseline, containerFolder);
+function acceptBaseline(sourceFolder, targetFolder) {
     console.log('Accept baselines from ' + sourceFolder + ' to ' + targetFolder);
     var files = fs.readdirSync(sourceFolder);
     var deleteEnding = '.delete';
@@ -1116,12 +1114,12 @@ function acceptBaseline(containerFolder) {
 
 desc("Makes the most recent rwc test results the new baseline, overwriting the old baseline");
 task("baseline-accept-rwc", function () {
-    acceptBaseline("rwc");
+    acceptBaseline(localRwcBaseline, refRwcBaseline);
 });
 
 desc("Makes the most recent test262 test results the new baseline, overwriting the old baseline");
 task("baseline-accept-test262", function () {
-    acceptBaseline("test262");
+    acceptBaseline(localTest262Baseline, refTest262Baseline);
 });
 
 
diff --git a/scripts/parallel-lint.js b/scripts/parallel-lint.js
index a9aec06c2df..aec9960ce47 100644
--- a/scripts/parallel-lint.js
+++ b/scripts/parallel-lint.js
@@ -1,26 +1,29 @@
-var Linter = require("tslint");
+var tslint = require("tslint");
 var fs = require("fs");
 
 function getLinterOptions() {
     return {
-        configuration: require("../tslint.json"),
         formatter: "prose",
         formattersDirectory: undefined,
         rulesDirectory: "built/local/tslint"
     };
 }
-
-function lintFileContents(options, path, contents) {
-    var ll = new Linter(path, contents, options);
-    return ll.lint();
+function getLinterConfiguration() {
+    return require("../tslint.json");
 }
 
-function lintFileAsync(options, path, cb) {
+function lintFileContents(options, configuration, path, contents) {
+    var ll = new tslint.Linter(options);
+    ll.lint(path, contents, configuration);
+    return ll.getResult();
+}
+
+function lintFileAsync(options, configuration, path, cb) {
     fs.readFile(path, "utf8", function (err, contents) {
         if (err) {
             return cb(err);
         }
-        var result = lintFileContents(options, path, contents);
+        var result = lintFileContents(options, configuration, path, contents);
         cb(undefined, result);
     });
 }
@@ -30,7 +33,8 @@ process.on("message", function (data) {
         case "file":
             var target = data.name;
             var lintOptions = getLinterOptions();
-            lintFileAsync(lintOptions, target, function (err, result) {
+            var lintConfiguration = getLinterConfiguration();
+            lintFileAsync(lintOptions, lintConfiguration, target, function (err, result) {
                 if (err) {
                     process.send({ kind: "error", error: err.toString() });
                     return;
diff --git a/scripts/tslint/booleanTriviaRule.ts b/scripts/tslint/booleanTriviaRule.ts
index b626b7560a6..db6abcbf17b 100644
--- a/scripts/tslint/booleanTriviaRule.ts
+++ b/scripts/tslint/booleanTriviaRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
diff --git a/scripts/tslint/nextLineRule.ts b/scripts/tslint/nextLineRule.ts
index d25652f7bce..2dee393bd84 100644
--- a/scripts/tslint/nextLineRule.ts
+++ b/scripts/tslint/nextLineRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 const OPTION_CATCH = "check-catch";
diff --git a/scripts/tslint/noInOperatorRule.ts b/scripts/tslint/noInOperatorRule.ts
index 527e8c1b895..307f0dffd6a 100644
--- a/scripts/tslint/noInOperatorRule.ts
+++ b/scripts/tslint/noInOperatorRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/noIncrementDecrementRule.ts b/scripts/tslint/noIncrementDecrementRule.ts
index f5c90abe893..2a957b36af5 100644
--- a/scripts/tslint/noIncrementDecrementRule.ts
+++ b/scripts/tslint/noIncrementDecrementRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/noTypeAssertionWhitespaceRule.ts b/scripts/tslint/noTypeAssertionWhitespaceRule.ts
index e75964b9e7e..5368dcf74ba 100644
--- a/scripts/tslint/noTypeAssertionWhitespaceRule.ts
+++ b/scripts/tslint/noTypeAssertionWhitespaceRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/objectLiteralSurroundingSpaceRule.ts b/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
index b527746bf51..a705e56c969 100644
--- a/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
+++ b/scripts/tslint/objectLiteralSurroundingSpaceRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts
index 445fbe2e72a..28d7446b290 100644
--- a/scripts/tslint/preferConstRule.ts
+++ b/scripts/tslint/preferConstRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 export class Rule extends Lint.Rules.AbstractRule {
diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts
index 559d1b34937..50f2971a0ee 100644
--- a/scripts/tslint/typeOperatorSpacingRule.ts
+++ b/scripts/tslint/typeOperatorSpacingRule.ts
@@ -1,4 +1,4 @@
-import * as Lint from "tslint/lib/lint";
+import * as Lint from "tslint/lib";
 import * as ts from "typescript";
 
 
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 510d7f8b142..cdf3b2a7987 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -598,8 +598,8 @@ namespace ts {
             // Binding of JsDocComment should be done before the current block scope container changes.
             // because the scope of JsDocComment should not be affected by whether the current node is a
             // container or not.
-            if (isInJavaScriptFile(node) && node.jsDocComments) {
-                forEach(node.jsDocComments, bind);
+            if (isInJavaScriptFile(node) && node.jsDoc) {
+                forEach(node.jsDoc, bind);
             }
             if (checkUnreachable(node)) {
                 bindEachChild(node);
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 57ca5689e5b..064123c8e9c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -145,7 +145,6 @@ namespace ts {
         const voidType = createIntrinsicType(TypeFlags.Void, "void");
         const neverType = createIntrinsicType(TypeFlags.Never, "never");
         const silentNeverType = createIntrinsicType(TypeFlags.Never, "never");
-        const stringOrNumberType = getUnionType([stringType, numberType]);
 
         const emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
 
@@ -915,6 +914,7 @@ namespace ts {
                     if (!errorLocation ||
                         !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) &&
                         !checkAndReportErrorForExtendingInterface(errorLocation) &&
+                        !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
                         !checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning)) {
                         error(errorLocation, nameNotFoundMessage, typeof nameArg === "string" ? nameArg : declarationNameToString(nameArg));
                     }
@@ -1025,6 +1025,18 @@ namespace ts {
             }
         }
 
+        function checkAndReportErrorForUsingTypeAsNamespace(errorLocation: Node, name: string, meaning: SymbolFlags): boolean {
+            if (meaning === SymbolFlags.Namespace) {
+                const symbol = resolveSymbol(resolveName(errorLocation, name, SymbolFlags.Type & ~SymbolFlags.Value, /*nameNotFoundMessage*/undefined, /*nameArg*/ undefined));
+                if (symbol) {
+                    error(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here, name);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         function checkAndReportErrorForUsingTypeAsValue(errorLocation: Node, name: string, meaning: SymbolFlags): boolean {
             if (meaning & (SymbolFlags.Value & ~SymbolFlags.NamespaceModule)) {
                 const symbol = resolveSymbol(resolveName(errorLocation, name, SymbolFlags.Type & ~SymbolFlags.Value, /*nameNotFoundMessage*/undefined, /*nameArg*/ undefined));
@@ -3030,7 +3042,15 @@ namespace ts {
         }
 
         function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
-            Debug.assert(!!(source.flags & TypeFlags.Object), "Rest types only support object types right now.");
+            source = filterType(source, t => !(t.flags & TypeFlags.Nullable));
+            if (source.flags & TypeFlags.Never) {
+                return emptyObjectType;
+            }
+
+            if (source.flags & TypeFlags.Union) {
+                return mapType(source, t => getRestType(t, properties, symbol));
+            }
+
             const members = createMap<Symbol>();
             const names = createMap<true>();
             for (const name of properties) {
@@ -3071,7 +3091,7 @@ namespace ts {
             let type: Type;
             if (pattern.kind === SyntaxKind.ObjectBindingPattern) {
                 if (declaration.dotDotDotToken) {
-                    if (!(parentType.flags & TypeFlags.Object)) {
+                    if (!isValidSpreadType(parentType)) {
                         error(declaration, Diagnostics.Rest_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -3144,38 +3164,10 @@ namespace ts {
         }
 
         function getTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration) {
-            const jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
-            if (jsDocType) {
-                return getTypeFromTypeNode(jsDocType);
+            const jsdocType = getJSDocType(declaration);
+            if (jsdocType) {
+                return getTypeFromTypeNode(jsdocType);
             }
-        }
-
-        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration: VariableLikeDeclaration): JSDocType {
-            // First, see if this node has an @type annotation on it directly.
-            const typeTag = getJSDocTypeTag(declaration);
-            if (typeTag && typeTag.typeExpression) {
-                return typeTag.typeExpression.type;
-            }
-
-            if (declaration.kind === SyntaxKind.VariableDeclaration &&
-                declaration.parent.kind === SyntaxKind.VariableDeclarationList &&
-                declaration.parent.parent.kind === SyntaxKind.VariableStatement) {
-
-                // @type annotation might have been on the variable statement, try that instead.
-                const annotation = getJSDocTypeTag(declaration.parent.parent);
-                if (annotation && annotation.typeExpression) {
-                    return annotation.typeExpression.type;
-                }
-            }
-            else if (declaration.kind === SyntaxKind.Parameter) {
-                // If it's a parameter, see if the parent has a jsdoc comment with an @param
-                // annotation.
-                const paramTag = getCorrespondingJSDocParameterTag(<ParameterDeclaration>declaration);
-                if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type;
-                }
-            }
-
             return undefined;
         }
 
@@ -3205,9 +3197,11 @@ namespace ts {
                 }
             }
 
-            // A variable declared in a for..in statement is always of type string
+            // A variable declared in a for..in statement is of type string, or of type keyof T when the
+            // right hand expression is of a type parameter type.
             if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
-                return stringType;
+                const indexType = getIndexType(checkNonNullExpression((<ForInStatement>declaration.parent.parent).expression));
+                return indexType.flags & (TypeFlags.TypeParameter | TypeFlags.Index) ? indexType : stringType;
             }
 
             if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
@@ -3444,9 +3438,9 @@ namespace ts {
                     declaration.kind === SyntaxKind.PropertyAccessExpression && declaration.parent.kind === SyntaxKind.BinaryExpression) {
                     // Use JS Doc type if present on parent expression statement
                     if (declaration.flags & NodeFlags.JavaScriptFile) {
-                        const typeTag = getJSDocTypeTag(declaration.parent);
-                        if (typeTag && typeTag.typeExpression) {
-                            return links.type = getTypeFromTypeNode(typeTag.typeExpression.type);
+                        const jsdocType = getJSDocType(declaration.parent);
+                        if (jsdocType) {
+                            return links.type = getTypeFromTypeNode(jsdocType);
                         }
                     }
                     const declaredTypes = map(symbol.declarations,
@@ -3820,6 +3814,16 @@ namespace ts {
                 }
                 baseType = getReturnTypeOfSignature(constructors[0]);
             }
+
+            // In a JS file, you can use the @augments jsdoc tag to specify a base type with type parameters
+            const valueDecl = type.symbol.valueDeclaration;
+            if (valueDecl && isInJavaScriptFile(valueDecl)) {
+                const augTag = getJSDocAugmentsTag(type.symbol.valueDeclaration);
+                if (augTag) {
+                    baseType = getTypeFromTypeNode(augTag.typeExpression.type);
+                }
+            }
+
             if (baseType === unknownType) {
                 return;
             }
@@ -3828,7 +3832,7 @@ namespace ts {
                 return;
             }
             if (type === baseType || hasBaseType(<InterfaceType>baseType, type)) {
-                error(type.symbol.valueDeclaration, Diagnostics.Type_0_recursively_references_itself_as_a_base_type,
+                error(valueDecl, Diagnostics.Type_0_recursively_references_itself_as_a_base_type,
                     typeToString(type, /*enclosingDeclaration*/ undefined, TypeFormatFlags.WriteArrayAsGenericType));
                 return;
             }
@@ -4494,16 +4498,17 @@ namespace ts {
         function resolveMappedTypeMembers(type: MappedType) {
             const members: SymbolTable = createMap<Symbol>();
             let stringIndexInfo: IndexInfo;
-            let numberIndexInfo: IndexInfo;
             // Resolve upfront such that recursive references see an empty object type.
             setStructuredTypeMembers(type, emptySymbols, emptyArray, emptyArray, undefined, undefined);
             // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
-            // and T as the template type.
+            // and T as the template type. If K is of the form 'keyof S', the mapped type and S are
+            // isomorphic and we copy property modifiers from corresponding properties in S.
             const typeParameter = getTypeParameterFromMappedType(type);
             const constraintType = getConstraintTypeFromMappedType(type);
+            const isomorphicType = getIsomorphicTypeFromMappedType(type);
             const templateType = getTemplateTypeFromMappedType(type);
-            const isReadonly = !!type.declaration.readonlyToken;
-            const isOptional = !!type.declaration.questionToken;
+            const templateReadonly = !!type.declaration.readonlyToken;
+            const templateOptional = !!type.declaration.questionToken;
             // First, if the constraint type is a type parameter, obtain the base constraint. Then,
             // if the key type is a 'keyof X', obtain 'keyof C' where C is the base constraint of X.
             // Finally, iterate over the constituents of the resulting iteration type.
@@ -4516,29 +4521,22 @@ namespace ts {
                 const iterationMapper = createUnaryTypeMapper(typeParameter, t);
                 const templateMapper = type.mapper ? combineTypeMappers(type.mapper, iterationMapper) : iterationMapper;
                 const propType = instantiateType(templateType, templateMapper);
-                // If the current iteration type constituent is a literal type, create a property.
-                // Otherwise, for type string create a string index signature and for type number
-                // create a numeric index signature.
-                if (t.flags & (TypeFlags.StringLiteral | TypeFlags.NumberLiteral | TypeFlags.EnumLiteral)) {
+                // If the current iteration type constituent is a string literal type, create a property.
+                // Otherwise, for type string create a string index signature.
+                if (t.flags & TypeFlags.StringLiteral) {
                     const propName = (<LiteralType>t).text;
+                    const isomorphicProp = isomorphicType && getPropertyOfType(isomorphicType, propName);
+                    const isOptional = templateOptional || !!(isomorphicProp && isomorphicProp.flags & SymbolFlags.Optional);
                     const prop = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | (isOptional ? SymbolFlags.Optional : 0), propName);
-                    prop.type = addOptionality(propType, isOptional);
-                    prop.isReadonly = isReadonly;
+                    prop.type = propType;
+                    prop.isReadonly = templateReadonly || isomorphicProp && isReadonlySymbol(isomorphicProp);
                     members[propName] = prop;
                 }
                 else if (t.flags & TypeFlags.String) {
-                    stringIndexInfo = createIndexInfo(propType, isReadonly);
-                }
-                else if (t.flags & TypeFlags.Number) {
-                    numberIndexInfo = createIndexInfo(propType, isReadonly);
+                    stringIndexInfo = createIndexInfo(propType, templateReadonly);
                 }
             });
-            // If we created both a string and a numeric string index signature, and if the two index
-            // signatures have identical types, discard the redundant numeric index signature.
-            if (stringIndexInfo && numberIndexInfo && isTypeIdenticalTo(stringIndexInfo.type, numberIndexInfo.type)) {
-                numberIndexInfo = undefined;
-            }
-            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
+            setStructuredTypeMembers(type, members, emptyArray, emptyArray, stringIndexInfo, undefined);
         }
 
         function getTypeParameterFromMappedType(type: MappedType) {
@@ -4554,10 +4552,15 @@ namespace ts {
         function getTemplateTypeFromMappedType(type: MappedType) {
             return type.templateType ||
                 (type.templateType = type.declaration.type ?
-                    instantiateType(getTypeFromTypeNode(type.declaration.type), type.mapper || identityMapper) :
+                    instantiateType(addOptionality(getTypeFromTypeNode(type.declaration.type), !!type.declaration.questionToken), type.mapper || identityMapper) :
                     unknownType);
         }
 
+        function getIsomorphicTypeFromMappedType(type: MappedType) {
+            const constraint = getConstraintDeclaration(getTypeParameterFromMappedType(type));
+            return constraint.kind === SyntaxKind.TypeOperator ? instantiateType(getTypeFromTypeNode((<TypeOperatorNode>constraint).type), type.mapper || identityMapper) : undefined;
+        }
+
         function getErasedTemplateTypeFromMappedType(type: MappedType) {
             return instantiateType(getTemplateTypeFromMappedType(type), createUnaryTypeMapper(getTypeParameterFromMappedType(type), anyType));
         }
@@ -4684,7 +4687,6 @@ namespace ts {
                 t.flags & TypeFlags.NumberLike ? globalNumberType :
                 t.flags & TypeFlags.BooleanLike ? globalBooleanType :
                 t.flags & TypeFlags.ESSymbol ? getGlobalESSymbolType(/*checked*/ languageVersion >= ScriptTarget.ES2015) :
-                t.flags & TypeFlags.Index ? stringOrNumberType :
                 t;
         }
 
@@ -4897,15 +4899,16 @@ namespace ts {
                 if (node.type && node.type.kind === SyntaxKind.JSDocOptionalType) {
                     return true;
                 }
+                const paramTags = getJSDocParameterTags(node);
+                if (paramTags) {
+                    for (const paramTag of paramTags) {
+                        if (paramTag.isBracketed) {
+                            return true;
+                        }
 
-                const paramTag = getCorrespondingJSDocParameterTag(node);
-                if (paramTag) {
-                    if (paramTag.isBracketed) {
-                        return true;
-                    }
-
-                    if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === SyntaxKind.JSDocOptionalType;
+                        if (paramTag.typeExpression) {
+                            return paramTag.typeExpression.type.kind === SyntaxKind.JSDocOptionalType;
+                        }
                     }
                 }
             }
@@ -5694,6 +5697,7 @@ namespace ts {
             containsString?: boolean;
             containsNumber?: boolean;
             containsStringOrNumberLiteral?: boolean;
+            unionIndex?: number;
         }
 
         function binarySearchTypes(types: Type[], type: Type): number {
@@ -5888,6 +5892,9 @@ namespace ts {
                 typeSet.containsAny = true;
             }
             else if (!(type.flags & TypeFlags.Never) && (strictNullChecks || !(type.flags & TypeFlags.Nullable)) && !contains(typeSet, type)) {
+                if (type.flags & TypeFlags.Union && typeSet.unionIndex === undefined) {
+                    typeSet.unionIndex = typeSet.length;
+                }
                 typeSet.push(type);
             }
         }
@@ -5914,15 +5921,6 @@ namespace ts {
             if (types.length === 0) {
                 return emptyObjectType;
             }
-            for (let i = 0; i < types.length; i++) {
-                const type = types[i];
-                if (type.flags & TypeFlags.Union) {
-                    // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                    // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                    return getUnionType(map((<UnionType>type).types, t => getIntersectionType(replaceElement(types, i, t))),
-                        /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
-                }
-            }
             const typeSet = [] as TypeSet;
             addTypesToIntersection(typeSet, types);
             if (typeSet.containsAny) {
@@ -5931,6 +5929,14 @@ namespace ts {
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
+            const unionIndex = typeSet.unionIndex;
+            if (unionIndex !== undefined) {
+                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                const unionType = <UnionType>typeSet[unionIndex];
+                return getUnionType(map(unionType.types, t => getIntersectionType(replaceElement(typeSet, unionIndex, t))),
+                    /*subtypeReduction*/ false, aliasSymbol, aliasTypeArguments);
+            }
             const id = getTypeListId(typeSet);
             let type = intersectionTypes[id];
             if (!type) {
@@ -5973,11 +5979,15 @@ namespace ts {
         function getIndexType(type: Type): Type {
             return type.flags & TypeFlags.TypeParameter ? getIndexTypeForTypeParameter(<TypeParameter>type) :
                 getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
-                type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringOrNumberType :
-                getIndexInfoOfType(type, IndexKind.Number) ? getUnionType([numberType, getLiteralTypeFromPropertyNames(type)]) :
+                type.flags & TypeFlags.Any || getIndexInfoOfType(type, IndexKind.String) ? stringType :
                 getLiteralTypeFromPropertyNames(type);
         }
 
+        function getIndexTypeOrString(type: Type): Type {
+            const indexType = getIndexType(type);
+            return indexType !== neverType ? indexType : stringType;
+        }
+
         function getTypeFromTypeOperatorNode(node: TypeOperatorNode) {
             const links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -6064,7 +6074,7 @@ namespace ts {
             }
             const mapper = createUnaryTypeMapper(getTypeParameterFromMappedType(type), indexType);
             const templateMapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
-            return addOptionality(instantiateType(getTemplateTypeFromMappedType(type), templateMapper), !!type.declaration.questionToken);
+            return instantiateType(getTemplateTypeFromMappedType(type), templateMapper);
         }
 
         function getIndexedAccessType(objectType: Type, indexType: Type, accessNode?: ElementAccessExpression | IndexedAccessTypeNode) {
@@ -6076,8 +6086,7 @@ namespace ts {
                 // meaningfully access the properties of the object type. In those cases, we first check that the
                 // index type is assignable to 'keyof T' for the object type.
                 if (accessNode) {
-                    const keyType = indexType.flags & TypeFlags.TypeParameter ? getConstraintOfTypeParameter(<TypeParameter>indexType) || emptyObjectType : indexType;
-                    if (!isTypeAssignableTo(keyType, getIndexType(objectType))) {
+                    if (!isTypeAssignableTo(indexType, getIndexType(objectType))) {
                         error(accessNode, Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
                         return unknownType;
                     }
@@ -6092,11 +6101,11 @@ namespace ts {
                 const id = objectType.id + "," + indexType.id;
                 return indexedAccessTypes[id] || (indexedAccessTypes[id] = createIndexedAccessType(objectType, indexType));
             }
-            const apparentType = getApparentType(objectType);
+            const apparentObjectType = getApparentType(objectType);
             if (indexType.flags & TypeFlags.Union && !(indexType.flags & TypeFlags.Primitive)) {
                 const propTypes: Type[] = [];
                 for (const t of (<UnionType>indexType).types) {
-                    const propType = getPropertyTypeForIndexType(apparentType, t, accessNode, /*cacheSymbol*/ false);
+                    const propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false);
                     if (propType === unknownType) {
                         return unknownType;
                     }
@@ -6104,7 +6113,7 @@ namespace ts {
                 }
                 return getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentType, indexType, accessNode, /*cacheSymbol*/ true);
+            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true);
         }
 
         function getTypeFromIndexedAccessTypeNode(node: IndexedAccessTypeNode) {
@@ -6162,11 +6171,25 @@ namespace ts {
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left: Type, right: Type, isFromObjectLiteral: boolean): ResolvedType | IntrinsicType {
-            Debug.assert(!!(left.flags & (TypeFlags.Object | TypeFlags.Any)) && !!(right.flags & (TypeFlags.Object | TypeFlags.Any)), "Only object types may be spread.");
+        function getSpreadType(left: Type, right: Type, isFromObjectLiteral: boolean): Type  {
             if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
                 return anyType;
             }
+            left = filterType(left, t => !(t.flags & TypeFlags.Nullable));
+            if (left.flags & TypeFlags.Never) {
+                return right;
+            }
+            right = filterType(right, t => !(t.flags & TypeFlags.Nullable));
+            if (right.flags & TypeFlags.Never) {
+                return left;
+            }
+            if (left.flags & TypeFlags.Union) {
+                return mapType(left, t => getSpreadType(t, right, isFromObjectLiteral));
+            }
+            if (right.flags & TypeFlags.Union) {
+                return mapType(right, t => getSpreadType(left, t, isFromObjectLiteral));
+            }
+
             const members = createMap<Symbol>();
             const skippedPrivateMembers = createMap<boolean>();
             let stringIndexInfo: IndexInfo;
@@ -6553,7 +6576,36 @@ namespace ts {
             return result;
         }
 
-        function instantiateMappedType(type: MappedType, mapper: TypeMapper): MappedType {
+        function instantiateMappedType(type: MappedType, mapper: TypeMapper): Type {
+            // Check if we have an isomorphic mapped type, i.e. a type of the form { [P in keyof T]: X } for some
+            // type parameter T. If so, the mapped type is distributive over a union type and when T is instantiated
+            // to a union type A | B, we produce { [P in keyof A]: X } | { [P in keyof B]: X }. Furthermore, for
+            // isomorphic mapped types we leave primitive types alone. For example, when T is instantiated to a
+            // union type A | undefined, we produce { [P in keyof A]: X } | undefined.
+            const constraintType = getConstraintTypeFromMappedType(type);
+            if (constraintType.flags & TypeFlags.Index) {
+                const typeParameter = (<IndexType>constraintType).type;
+                const mappedTypeParameter = mapper(typeParameter);
+                if (typeParameter !== mappedTypeParameter) {
+                    return mapType(mappedTypeParameter, t => {
+                        if (isMappableType(t)) {
+                            const replacementMapper = createUnaryTypeMapper(typeParameter, t);
+                            const combinedMapper = mapper.mappedTypes && mapper.mappedTypes.length === 1 ? replacementMapper : combineTypeMappers(replacementMapper, mapper);
+                            combinedMapper.mappedTypes = mapper.mappedTypes;
+                            return instantiateMappedObjectType(type, combinedMapper);
+                        }
+                        return t;
+                    });
+                }
+            }
+            return instantiateMappedObjectType(type, mapper);
+        }
+
+        function isMappableType(type: Type) {
+            return type.flags & (TypeFlags.TypeParameter | TypeFlags.Object | TypeFlags.Intersection | TypeFlags.IndexedAccess);
+        }
+
+        function instantiateMappedObjectType(type: MappedType, mapper: TypeMapper): Type {
             const result = <MappedType>createObjectType(ObjectFlags.Mapped | ObjectFlags.Instantiated, type.symbol);
             result.declaration = type.declaration;
             result.mapper = type.mapper ? combineTypeMappers(type.mapper, mapper) : mapper;
@@ -7176,13 +7228,6 @@ namespace ts {
 
                 if (isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined)) return Ternary.True;
 
-                if (source.flags & TypeFlags.Index) {
-                    // A keyof T is related to a union type containing both string and number
-                    if (maybeTypeOfKind(target, TypeFlags.String) && maybeTypeOfKind(target, TypeFlags.Number)) {
-                        return Ternary.True;
-                    }
-                }
-
                 if (getObjectFlags(source) & ObjectFlags.ObjectLiteral && source.flags & TypeFlags.FreshLiteral) {
                     if (hasExcessProperties(<FreshObjectLiteralType>source, target, reportErrors)) {
                         if (reportErrors) {
@@ -7602,25 +7647,30 @@ namespace ts {
 
             // A type [P in S]: X is related to a type [P in T]: Y if T is related to S and X is related to Y.
             function mappedTypeRelatedTo(source: Type, target: Type, reportErrors: boolean): Ternary {
-                if (isGenericMappedType(source) && isGenericMappedType(target)) {
-                    let result: Ternary;
-                    if (relation === identityRelation) {
-                        const readonlyMatches = !(<MappedType>source).declaration.readonlyToken === !(<MappedType>target).declaration.readonlyToken;
-                        const optionalMatches = !(<MappedType>source).declaration.questionToken === !(<MappedType>target).declaration.questionToken;
-                        if (readonlyMatches && optionalMatches) {
-                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
-                                return result & isRelatedTo(getErasedTemplateTypeFromMappedType(<MappedType>source), getErasedTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                if (isGenericMappedType(target)) {
+                    if (isGenericMappedType(source)) {
+                        let result: Ternary;
+                        if (relation === identityRelation) {
+                            const readonlyMatches = !(<MappedType>source).declaration.readonlyToken === !(<MappedType>target).declaration.readonlyToken;
+                            const optionalMatches = !(<MappedType>source).declaration.questionToken === !(<MappedType>target).declaration.questionToken;
+                            if (readonlyMatches && optionalMatches) {
+                                if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                    return result & isRelatedTo(getErasedTemplateTypeFromMappedType(<MappedType>source), getErasedTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                                }
                             }
                         }
-                    }
-                    else {
-                        if (relation === comparableRelation || !(<MappedType>source).declaration.questionToken || (<MappedType>target).declaration.questionToken) {
-                            if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
-                                return result & isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                        else {
+                            if (relation === comparableRelation || !(<MappedType>source).declaration.questionToken || (<MappedType>target).declaration.questionToken) {
+                                if (result = isRelatedTo(getConstraintTypeFromMappedType(<MappedType>target), getConstraintTypeFromMappedType(<MappedType>source), reportErrors)) {
+                                    return result & isRelatedTo(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target), reportErrors);
+                                }
                             }
                         }
                     }
                 }
+                else if (relation !== identityRelation && isEmptyObjectType(resolveStructuredTypeMembers(<ObjectType>target))) {
+                    return Ternary.True;
+                }
                 return Ternary.False;
             }
 
@@ -8456,7 +8506,7 @@ namespace ts {
         // results for union and intersection types for performance reasons.
         function couldContainTypeParameters(type: Type): boolean {
             const objectFlags = getObjectFlags(type);
-            return !!(type.flags & TypeFlags.TypeParameter ||
+            return !!(type.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess) ||
                 objectFlags & ObjectFlags.Reference && forEach((<TypeReference>type).typeArguments, couldContainTypeParameters) ||
                 objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Method | SymbolFlags.TypeLiteral | SymbolFlags.Class) ||
                 objectFlags & ObjectFlags.Mapped ||
@@ -8474,8 +8524,59 @@ namespace ts {
             return type === typeParameter || type.flags & TypeFlags.UnionOrIntersection && forEach((<UnionOrIntersectionType>type).types, t => isTypeParameterAtTopLevel(t, typeParameter));
         }
 
-        function inferTypes(context: InferenceContext, originalSource: Type, originalTarget: Type) {
-            const typeParameters = context.signature.typeParameters;
+        // Infer a suitable input type for an isomorphic mapped type { [P in keyof T]: X }. We construct
+        // an object type with the same set of properties as the source type, where the type of each
+        // property is computed by inferring from the source property type to X for a synthetic type
+        // parameter T[P] (i.e. we treat the type T[P] as the type parameter we're inferring for).
+        function inferTypeForIsomorphicMappedType(source: Type, target: MappedType): Type {
+            if (!isMappableType(source)) {
+                return source;
+            }
+            const typeParameter = getIndexedAccessType((<IndexType>getConstraintTypeFromMappedType(target)).type, getTypeParameterFromMappedType(target));
+            const typeParameterArray = [typeParameter];
+            const typeInferences = createTypeInferencesObject();
+            const typeInferencesArray = [typeInferences];
+            const templateType = getTemplateTypeFromMappedType(target);
+            const readonlyMask = target.declaration.readonlyToken ? false : true;
+            const optionalMask = target.declaration.questionToken ? 0 : SymbolFlags.Optional;
+            const properties = getPropertiesOfType(source);
+            const members = createSymbolTable(properties);
+            let hasInferredTypes = false;
+            for (const prop of properties) {
+                const inferredPropType = inferTargetType(getTypeOfSymbol(prop));
+                if (inferredPropType) {
+                    const inferredProp = <TransientSymbol>createSymbol(SymbolFlags.Property | SymbolFlags.Transient | prop.flags & optionalMask, prop.name);
+                    inferredProp.declarations = prop.declarations;
+                    inferredProp.type = inferredPropType;
+                    inferredProp.isReadonly = readonlyMask && isReadonlySymbol(prop);
+                    members[prop.name] = inferredProp;
+                    hasInferredTypes = true;
+                }
+            }
+            let indexInfo = getIndexInfoOfType(source, IndexKind.String);
+            if (indexInfo) {
+                const inferredIndexType = inferTargetType(indexInfo.type);
+                if (inferredIndexType) {
+                    indexInfo = createIndexInfo(inferredIndexType, readonlyMask && indexInfo.isReadonly);
+                    hasInferredTypes = true;
+                }
+            }
+            return hasInferredTypes ? createAnonymousType(undefined, members, emptyArray, emptyArray, indexInfo, undefined) : source;
+
+            function inferTargetType(sourceType: Type): Type {
+                typeInferences.primary = undefined;
+                typeInferences.secondary = undefined;
+                inferTypes(typeParameterArray, typeInferencesArray, sourceType, templateType);
+                const inferences = typeInferences.primary || typeInferences.secondary;
+                return inferences && getUnionType(inferences, /*subtypeReduction*/ true);
+            }
+        }
+
+        function inferTypesWithContext(context: InferenceContext, originalSource: Type, originalTarget: Type) {
+            inferTypes(context.signature.typeParameters, context.inferences, originalSource, originalTarget);
+        }
+
+        function inferTypes(typeParameters: Type[], typeInferences: TypeInferences[], originalSource: Type, originalTarget: Type) {
             let sourceStack: Type[];
             let targetStack: Type[];
             let depth = 0;
@@ -8543,7 +8644,7 @@ namespace ts {
                         target = removeTypesFromUnionOrIntersection(<UnionOrIntersectionType>target, matchingTypes);
                     }
                 }
-                if (target.flags & TypeFlags.TypeParameter) {
+                if (target.flags & (TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
                     // Because the anyFunctionType is internal, it should not be exposed to the user by adding
@@ -8555,7 +8656,7 @@ namespace ts {
                     }
                     for (let i = 0; i < typeParameters.length; i++) {
                         if (target === typeParameters[i]) {
-                            const inferences = context.inferences[i];
+                            const inferences = typeInferences[i];
                             if (!inferences.isFixed) {
                                 // Any inferences that are made to a type parameter in a union type are inferior
                                 // to inferences made to a flat (non-union) type. This is because if we infer to
@@ -8569,7 +8670,7 @@ namespace ts {
                                 if (!contains(candidates, source)) {
                                     candidates.push(source);
                                 }
-                                if (!isTypeParameterAtTopLevel(originalTarget, <TypeParameter>target)) {
+                                if (target.flags & TypeFlags.TypeParameter && !isTypeParameterAtTopLevel(originalTarget, <TypeParameter>target)) {
                                     inferences.topLevel = false;
                                 }
                             }
@@ -8617,19 +8718,6 @@ namespace ts {
                     }
                 }
                 else {
-                    if (getObjectFlags(target) & ObjectFlags.Mapped) {
-                        const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
-                        if (getObjectFlags(source) & ObjectFlags.Mapped) {
-                            inferFromTypes(getConstraintTypeFromMappedType(<MappedType>source), constraintType);
-                            inferFromTypes(getTemplateTypeFromMappedType(<MappedType>source), getTemplateTypeFromMappedType(<MappedType>target));
-                            return;
-                        }
-                        if (constraintType.flags & TypeFlags.TypeParameter) {
-                            inferFromTypes(getIndexType(source), constraintType);
-                            inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
-                            return;
-                        }
-                    }
                     source = getApparentType(source);
                     if (source.flags & TypeFlags.Object) {
                         if (isInProcess(source, target)) {
@@ -8650,15 +8738,39 @@ namespace ts {
                         sourceStack[depth] = source;
                         targetStack[depth] = target;
                         depth++;
-                        inferFromProperties(source, target);
-                        inferFromSignatures(source, target, SignatureKind.Call);
-                        inferFromSignatures(source, target, SignatureKind.Construct);
-                        inferFromIndexTypes(source, target);
+                        inferFromObjectTypes(source, target);
                         depth--;
                     }
                 }
             }
 
+            function inferFromObjectTypes(source: Type, target: Type) {
+                if (getObjectFlags(target) & ObjectFlags.Mapped) {
+                    const constraintType = getConstraintTypeFromMappedType(<MappedType>target);
+                    if (constraintType.flags & TypeFlags.Index) {
+                        // We're inferring from some source type S to an isomorphic mapped type { [P in keyof T]: X },
+                        // where T is a type parameter. Use inferTypeForIsomorphicMappedType to infer a suitable source
+                        // type and then infer from that type to T.
+                        const index = indexOf(typeParameters, (<IndexType>constraintType).type);
+                        if (index >= 0 && !typeInferences[index].isFixed) {
+                            inferFromTypes(inferTypeForIsomorphicMappedType(source, <MappedType>target), typeParameters[index]);
+                        }
+                        return;
+                    }
+                    if (constraintType.flags & TypeFlags.TypeParameter) {
+                        // We're inferring from some source type S to a mapped type { [P in T]: X }, where T is a type
+                        // parameter. Infer from 'keyof S' to T and infer from a union of each property type in S to X.
+                        inferFromTypes(getIndexType(source), constraintType);
+                        inferFromTypes(getUnionType(map(getPropertiesOfType(source), getTypeOfSymbol)), getTemplateTypeFromMappedType(<MappedType>target));
+                        return;
+                    }
+                }
+                inferFromProperties(source, target);
+                inferFromSignatures(source, target, SignatureKind.Call);
+                inferFromSignatures(source, target, SignatureKind.Construct);
+                inferFromIndexTypes(source, target);
+            }
+
             function inferFromProperties(source: Type, target: Type) {
                 const properties = getPropertiesOfObjectType(target);
                 for (const targetProp of properties) {
@@ -9053,7 +9165,7 @@ namespace ts {
 
         function getTypeWithDefault(type: Type, defaultExpression: Expression) {
             if (defaultExpression) {
-                const defaultType = checkExpression(defaultExpression);
+                const defaultType = getTypeOfExpression(defaultExpression);
                 return getUnionType([getTypeWithFacts(type, TypeFacts.NEUndefined), defaultType]);
             }
             return type;
@@ -9080,7 +9192,7 @@ namespace ts {
         function getAssignedTypeOfBinaryExpression(node: BinaryExpression): Type {
             return node.parent.kind === SyntaxKind.ArrayLiteralExpression || node.parent.kind === SyntaxKind.PropertyAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
-                checkExpression(node.right);
+                getTypeOfExpression(node.right);
         }
 
         function getAssignedTypeOfArrayLiteralElement(node: ArrayLiteralExpression, element: Expression): Type {
@@ -9138,7 +9250,7 @@ namespace ts {
             // from its initializer, we'll already have cached the type. Otherwise we compute it now
             // without caching such that transient types are reflected.
             const links = getNodeLinks(node);
-            return links.resolvedType || checkExpression(node);
+            return links.resolvedType || getTypeOfExpression(node);
         }
 
         function getInitialTypeOfVariableDeclaration(node: VariableDeclaration) {
@@ -9198,7 +9310,7 @@ namespace ts {
 
         function getTypeOfSwitchClause(clause: CaseClause | DefaultClause) {
             if (clause.kind === SyntaxKind.CaseClause) {
-                const caseType = getRegularTypeOfLiteralType(checkExpression((<CaseClause>clause).expression));
+                const caseType = getRegularTypeOfLiteralType(getTypeOfExpression((<CaseClause>clause).expression));
                 return isUnitType(caseType) ? caseType : undefined;
             }
             return neverType;
@@ -9303,7 +9415,7 @@ namespace ts {
         // we defer subtype reduction until the evolving array type is finalized into a manifest
         // array type.
         function addEvolvingArrayElementType(evolvingArrayType: EvolvingArrayType, node: Expression): EvolvingArrayType {
-            const elementType = getBaseTypeOfLiteralType(checkExpression(node));
+            const elementType = getBaseTypeOfLiteralType(getTypeOfExpression(node));
             return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
         }
 
@@ -9364,7 +9476,7 @@ namespace ts {
                 (<BinaryExpression>parent.parent).operatorToken.kind === SyntaxKind.EqualsToken &&
                 (<BinaryExpression>parent.parent).left === parent &&
                 !isAssignmentTarget(parent.parent) &&
-                isTypeAnyOrAllConstituentTypesHaveKind(checkExpression((<ElementAccessExpression>parent).argumentExpression), TypeFlags.NumberLike | TypeFlags.Undefined);
+                isTypeAnyOrAllConstituentTypesHaveKind(getTypeOfExpression((<ElementAccessExpression>parent).argumentExpression), TypeFlags.NumberLike | TypeFlags.Undefined);
             return isLengthPushOrUnshift || isElementAssignment;
         }
 
@@ -9526,7 +9638,7 @@ namespace ts {
                             }
                         }
                         else {
-                            const indexType = checkExpression((<ElementAccessExpression>(<BinaryExpression>node).left).argumentExpression);
+                            const indexType = getTypeOfExpression((<ElementAccessExpression>(<BinaryExpression>node).left).argumentExpression);
                             if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, TypeFlags.NumberLike | TypeFlags.Undefined)) {
                                 evolvedType = addEvolvingArrayElementType(evolvedType, (<BinaryExpression>node).right);
                             }
@@ -9751,7 +9863,7 @@ namespace ts {
                 if (operator === SyntaxKind.ExclamationEqualsToken || operator === SyntaxKind.ExclamationEqualsEqualsToken) {
                     assumeTrue = !assumeTrue;
                 }
-                const valueType = checkExpression(value);
+                const valueType = getTypeOfExpression(value);
                 if (valueType.flags & TypeFlags.Nullable) {
                     if (!strictNullChecks) {
                         return type;
@@ -9838,7 +9950,7 @@ namespace ts {
                 }
 
                 // Check that right operand is a function type with a prototype property
-                const rightType = checkExpression(expr.right);
+                const rightType = getTypeOfExpression(expr.right);
                 if (!isTypeSubtypeOf(rightType, globalFunctionType)) {
                     return type;
                 }
@@ -9979,7 +10091,7 @@ namespace ts {
                     location = location.parent;
                 }
                 if (isPartOfExpression(location) && !isAssignmentTarget(location)) {
-                    const type = checkExpression(<Expression>location);
+                    const type = getTypeOfExpression(<Expression>location);
                     if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
                         return type;
                     }
@@ -10445,9 +10557,9 @@ namespace ts {
         }
 
         function getTypeForThisExpressionFromJSDoc(node: Node) {
-            const typeTag = getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === SyntaxKind.JSDocFunctionType) {
-                const jsDocFunctionType = <JSDocFunctionType>typeTag.typeExpression.type;
+            const jsdocType = getJSDocType(node);
+            if (jsdocType && jsdocType.kind === SyntaxKind.JSDocFunctionType) {
+                const jsDocFunctionType = <JSDocFunctionType>jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === SyntaxKind.JSDocThisType) {
                     return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
                 }
@@ -10847,7 +10959,7 @@ namespace ts {
 
                 // In an assignment expression, the right operand is contextually typed by the type of the left operand.
                 if (node === binaryExpression.right) {
-                    return checkExpression(binaryExpression.left);
+                    return getTypeOfExpression(binaryExpression.left);
                 }
             }
             else if (operator === SyntaxKind.BarBarToken) {
@@ -10855,7 +10967,7 @@ namespace ts {
                 // expression has no contextual type, the right operand is contextually typed by the type of the left operand.
                 let type = getContextualType(binaryExpression);
                 if (!type && node === binaryExpression.right) {
-                    type = checkExpression(binaryExpression.left);
+                    type = getTypeOfExpression(binaryExpression.left);
                 }
                 return type;
             }
@@ -11418,7 +11530,7 @@ namespace ts {
                         typeFlags = 0;
                     }
                     const type = checkExpression((memberDecl as SpreadAssignment).expression);
-                    if (!(type.flags & (TypeFlags.Object | TypeFlags.Any))) {
+                    if (!isValidSpreadType(type)) {
                         error(memberDecl, Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return unknownType;
                     }
@@ -11496,6 +11608,12 @@ namespace ts {
             }
        }
 
+        function isValidSpreadType(type: Type): boolean {
+            return !!(type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined) ||
+                type.flags & TypeFlags.Object && !isGenericMappedType(type) ||
+                type.flags & TypeFlags.UnionOrIntersection && !forEach((<UnionOrIntersectionType>type).types, t => !isValidSpreadType(t)));
+        }
+
         function checkJsxSelfClosingElement(node: JsxSelfClosingElement) {
             checkJsxOpeningLikeElement(node);
             return jsxElementType || anyType;
@@ -12236,7 +12354,7 @@ namespace ts {
                         if (node.kind === SyntaxKind.ForInStatement &&
                             child === (<ForInStatement>node).statement &&
                             getForInVariableSymbol(<ForInStatement>node) === symbol &&
-                            hasNumericPropertyNames(checkExpression((<ForInStatement>node).expression))) {
+                            hasNumericPropertyNames(getTypeOfExpression((<ForInStatement>node).expression))) {
                             return true;
                         }
                         child = node;
@@ -12499,7 +12617,7 @@ namespace ts {
             const context = createInferenceContext(signature, /*inferUnionTypes*/ true);
             forEachMatchingParameterType(contextualSignature, signature, (source, target) => {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
-                inferTypes(context, instantiateType(source, contextualMapper), target);
+                inferTypesWithContext(context, instantiateType(source, contextualMapper), target);
             });
             return getSignatureInstantiation(signature, getInferredTypes(context));
         }
@@ -12534,7 +12652,7 @@ namespace ts {
             if (thisType) {
                 const thisArgumentNode = getThisArgumentOfCall(node);
                 const thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
-                inferTypes(context, thisArgumentType, thisType);
+                inferTypesWithContext(context, thisArgumentType, thisType);
             }
 
             // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
@@ -12556,7 +12674,7 @@ namespace ts {
                         argType = checkExpressionWithContextualType(arg, paramType, mapper);
                     }
 
-                    inferTypes(context, argType, paramType);
+                    inferTypesWithContext(context, argType, paramType);
                 }
             }
 
@@ -12571,7 +12689,7 @@ namespace ts {
                     if (excludeArgument[i] === false) {
                         const arg = args[i];
                         const paramType = getTypeAtPosition(signature, i);
-                        inferTypes(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
+                        inferTypesWithContext(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
                     }
                 }
             }
@@ -13662,7 +13780,7 @@ namespace ts {
                 for (let i = 0; i < len; i++) {
                     const declaration = <ParameterDeclaration>signature.parameters[i].valueDeclaration;
                     if (declaration.type) {
-                        inferTypes(mapper.context, getTypeFromTypeNode(declaration.type), getTypeAtPosition(context, i));
+                        inferTypesWithContext(mapper.context, getTypeFromTypeNode(declaration.type), getTypeAtPosition(context, i));
                     }
                 }
             }
@@ -13695,7 +13813,7 @@ namespace ts {
         // the destructured type into the contained binding elements.
         function assignBindingElementTypes(node: VariableLikeDeclaration) {
             if (isBindingPattern(node.name)) {
-                for (const element of (<BindingPattern>node.name).elements) {
+                for (const element of node.name.elements) {
                     if (!isOmittedExpression(element)) {
                         if (element.name.kind === SyntaxKind.Identifier) {
                             getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
@@ -13748,7 +13866,7 @@ namespace ts {
                 // T in the second overload so that we do not infer Base as a candidate for T
                 // (inferring Base would make type argument inference inconsistent between the two
                 // overloads).
-                inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
+                inferTypesWithContext(mapper.context, links.type, instantiateType(contextualType, mapper));
             }
         }
 
@@ -13887,7 +14005,7 @@ namespace ts {
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            const type = checkExpression(node.expression);
+            const type = getTypeOfExpression(node.expression);
             if (!isLiteralType(type)) {
                 return false;
             }
@@ -13895,7 +14013,7 @@ namespace ts {
             if (!switchTypes.length) {
                 return false;
             }
-            return eachTypeContainedIn(type, switchTypes);
+            return eachTypeContainedIn(mapType(type, getRegularTypeOfLiteralType), switchTypes);
         }
 
         function functionHasImplicitReturn(func: FunctionLikeDeclaration) {
@@ -14335,10 +14453,10 @@ namespace ts {
             // The in operator requires the left operand to be of type Any, the String primitive type, or the Number primitive type,
             // and the right operand to be of type Any, an object type, or a type parameter type.
             // The result is always of the Boolean primitive type.
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, TypeFlags.StringLike | TypeFlags.NumberLike | TypeFlags.ESSymbol)) {
+            if (!(isTypeComparableTo(leftType, stringType) || isTypeOfKind(leftType, TypeFlags.NumberLike | TypeFlags.ESSymbol))) {
                 error(left, Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
             }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                 error(right, Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
             return booleanType;
@@ -14954,7 +15072,7 @@ namespace ts {
                     }
                     contextualType = apparentType;
                 }
-                return maybeTypeOfKind(contextualType, TypeFlags.Literal);
+                return maybeTypeOfKind(contextualType, (TypeFlags.Literal | TypeFlags.Index));
             }
             return false;
         }
@@ -15007,6 +15125,24 @@ namespace ts {
             return type;
         }
 
+        // Returns the type of an expression. Unlike checkExpression, this function is simply concerned
+        // with computing the type and may not fully check all contained sub-expressions for errors.
+        function getTypeOfExpression(node: Expression) {
+            // Optimize for the common case of a call to a function with a single non-generic call
+            // signature where we can just fetch the return type without checking the arguments.
+            if (node.kind === SyntaxKind.CallExpression && (<CallExpression>node).expression.kind !== SyntaxKind.SuperKeyword) {
+                const funcType = checkNonNullExpression((<CallExpression>node).expression);
+                const signature = getSingleCallSignature(funcType);
+                if (signature && !signature.typeParameters) {
+                    return getReturnTypeOfSignature(signature);
+                }
+            }
+            // Otherwise simply call checkExpression. Ideally, the entire family of checkXXX functions
+            // should have a parameter that indicates whether full error checking is required such that
+            // we can perform the optimizations locally.
+            return checkExpression(node);
+        }
+
         // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
         // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
         // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
@@ -15768,7 +15904,7 @@ namespace ts {
             const type = <MappedType>getTypeFromMappedTypeNode(node);
             const constraintType = getConstraintTypeFromMappedType(type);
             const keyType = constraintType.flags & TypeFlags.TypeParameter ? getApparentTypeOfTypeParameter(<TypeParameter>constraintType) : constraintType;
-            checkTypeAssignableTo(keyType, stringOrNumberType, node.typeParameter.constraint);
+            checkTypeAssignableTo(keyType, stringType, node.typeParameter.constraint);
         }
 
         function isPrivateWithinAmbient(node: Node): boolean {
@@ -17294,6 +17430,7 @@ namespace ts {
             // Grammar checking
             checkGrammarForInOrForOfStatement(node);
 
+            const rightType = checkNonNullExpression(node.expression);
             // TypeScript 1.0 spec  (April 2014): 5.4
             // In a 'for-in' statement of the form
             // for (let VarDecl in Expr) Statement
@@ -17304,7 +17441,6 @@ namespace ts {
                 if (variable && isBindingPattern(variable.name)) {
                     error(variable.name, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
-
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
@@ -17317,7 +17453,7 @@ namespace ts {
                 if (varExpr.kind === SyntaxKind.ArrayLiteralExpression || varExpr.kind === SyntaxKind.ObjectLiteralExpression) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
-                else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, TypeFlags.StringLike)) {
+                else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
                     error(varExpr, Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
                 }
                 else {
@@ -17326,10 +17462,9 @@ namespace ts {
                 }
             }
 
-            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.Object | TypeFlags.TypeParameter)) {
+            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, TypeFlags.Object | TypeFlags.TypeParameter | TypeFlags.IndexedAccess)) {
                 error(node.expression, Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
             }
 
@@ -18643,7 +18778,7 @@ namespace ts {
                                     }
                                 }
 
-                                enumType = checkExpression(expression);
+                                enumType = getTypeOfExpression(expression);
                                 // allow references to constant members of other enums
                                 if (!(enumType.symbol && (enumType.symbol.flags & SymbolFlags.Enum))) {
                                     return undefined;
@@ -19813,7 +19948,7 @@ namespace ts {
                     // fallthrough
 
                 case SyntaxKind.SuperKeyword:
-                    const type = isPartOfExpression(node) ? checkExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
+                    const type = isPartOfExpression(node) ? getTypeOfExpression(<Expression>node) : getTypeFromTypeNode(<TypeNode>node);
                     return type.symbol;
 
                 case SyntaxKind.ThisType:
@@ -19843,7 +19978,7 @@ namespace ts {
                 case SyntaxKind.NumericLiteral:
                     // index access
                     if (node.parent.kind === SyntaxKind.ElementAccessExpression && (<ElementAccessExpression>node.parent).argumentExpression === node) {
-                        const objectType = checkExpression((<ElementAccessExpression>node.parent).expression);
+                        const objectType = getTypeOfExpression((<ElementAccessExpression>node.parent).expression);
                         if (objectType === unknownType) return undefined;
                         const apparentType = getApparentType(objectType);
                         if (apparentType === unknownType) return undefined;
@@ -19882,7 +20017,7 @@ namespace ts {
             }
 
             if (isPartOfExpression(node)) {
-                return getTypeOfExpression(<Expression>node);
+                return getRegularTypeOfExpression(<Expression>node);
             }
 
             if (isExpressionWithTypeArgumentsInClassExtendsClause(node)) {
@@ -19944,7 +20079,7 @@ namespace ts {
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
             if (expr.parent.kind === SyntaxKind.BinaryExpression) {
-                const iteratedType = checkExpression((<BinaryExpression>expr.parent).right);
+                const iteratedType = getTypeOfExpression((<BinaryExpression>expr.parent).right);
                 return checkDestructuringAssignment(expr, iteratedType || unknownType);
             }
             // If this is from nested object binding pattern
@@ -19974,11 +20109,11 @@ namespace ts {
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.text);
         }
 
-        function getTypeOfExpression(expr: Expression): Type {
+        function getRegularTypeOfExpression(expr: Expression): Type {
             if (isRightSideOfQualifiedNameOrPropertyAccess(expr)) {
                 expr = <Expression>expr.parent;
             }
-            return getRegularTypeOfLiteralType(checkExpression(expr));
+            return getRegularTypeOfLiteralType(getTypeOfExpression(expr));
         }
 
         /**
@@ -20405,7 +20540,7 @@ namespace ts {
         }
 
         function writeTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: SymbolWriter) {
-            const type = getWidenedType(getTypeOfExpression(expr));
+            const type = getWidenedType(getRegularTypeOfExpression(expr));
             getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
         }
 
@@ -21436,6 +21571,9 @@ namespace ts {
             else if (accessor.body === undefined && !(getModifierFlags(accessor) & ModifierFlags.Abstract)) {
                 return grammarErrorAtPos(getSourceFileOfNode(accessor), accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
             }
+            else if (accessor.body && getModifierFlags(accessor) & ModifierFlags.Abstract) {
+                return grammarErrorOnNode(accessor, Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
+            }
             else if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, Diagnostics.An_accessor_cannot_have_type_parameters);
             }
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 223eb075043..a584b7c567b 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -472,11 +472,18 @@ namespace ts {
     ];
 
     /* @internal */
-    export let typingOptionDeclarations: CommandLineOption[] = [
+    export let typeAcquisitionDeclarations: CommandLineOption[] = [
         {
+            /* @deprecated typingOptions.enableAutoDiscovery
+             * Use typeAcquisition.enable instead.
+             */
             name: "enableAutoDiscovery",
             type: "boolean",
         },
+        {
+            name: "enable",
+            type: "boolean",
+        },
         {
             name: "include",
             type: "list",
@@ -511,6 +518,20 @@ namespace ts {
 
     let optionNameMapCache: OptionNameMap;
 
+    /* @internal */
+    export function convertEnableAutoDiscoveryToEnable(typeAcquisition: TypeAcquisition): TypeAcquisition {
+        // Convert deprecated typingOptions.enableAutoDiscovery to typeAcquisition.enable
+        if (typeAcquisition && typeAcquisition.enableAutoDiscovery !== undefined && typeAcquisition.enable === undefined) {
+            const result: TypeAcquisition = {
+                enable: typeAcquisition.enableAutoDiscovery,
+                include: typeAcquisition.include || [],
+                exclude: typeAcquisition.exclude || []
+            };
+           return result;
+        }
+        return typeAcquisition;
+    }
+
     /* @internal */
     export function getOptionNameMap(): OptionNameMap {
         if (optionNameMapCache) {
@@ -845,7 +866,7 @@ namespace ts {
             return {
                 options: {},
                 fileNames: [],
-                typingOptions: {},
+                typeAcquisition: {},
                 raw: json,
                 errors: [createCompilerDiagnostic(Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, [...resolutionStack, resolvedPath].join(" -> "))],
                 wildcardDirectories: {}
@@ -853,7 +874,10 @@ namespace ts {
         }
 
         let options: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
+        // typingOptions has been deprecated and is only supported for backward compatibility purposes.
+        // It should be removed in future releases - use typeAcquisition instead.
+        const jsonOptions = json["typeAcquisition"] || json["typingOptions"];
+        const typeAcquisition: TypeAcquisition = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
 
         if (json["extends"]) {
             let [include, exclude, files, baseOptions]: [string[], string[], string[], CompilerOptions] = [undefined, undefined, undefined, {}];
@@ -884,7 +908,7 @@ namespace ts {
         return {
             options,
             fileNames,
-            typingOptions,
+            typeAcquisition,
             raw: json,
             errors,
             wildcardDirectories,
@@ -961,8 +985,8 @@ namespace ts {
                 errors.push(createCompilerDiagnostic(Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
             }
             else {
-                // By default, exclude common package folders and the outDir
-                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
+                // If no includes were specified, exclude common package folders and the outDir
+                excludeSpecs = includeSpecs ? [] : ["node_modules", "bower_components", "jspm_packages"];
 
                 const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
                 if (outDir) {
@@ -1006,9 +1030,9 @@ namespace ts {
         return { options, errors };
     }
 
-    export function convertTypingOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypingOptions, errors: Diagnostic[] } {
+    export function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): { options: TypeAcquisition, errors: Diagnostic[] } {
         const errors: Diagnostic[] = [];
-        const options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        const options = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
         return { options, errors };
     }
 
@@ -1022,16 +1046,18 @@ namespace ts {
         return options;
     }
 
-    function convertTypingOptionsFromJsonWorker(jsonOptions: any,
-        basePath: string, errors: Diagnostic[], configFileName?: string): TypingOptions {
+    function convertTypeAcquisitionFromJsonWorker(jsonOptions: any,
+        basePath: string, errors: Diagnostic[], configFileName?: string): TypeAcquisition {
+
+        const options: TypeAcquisition = { enable: getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+        const typeAcquisition = convertEnableAutoDiscoveryToEnable(jsonOptions);
+        convertOptionsFromJson(typeAcquisitionDeclarations, typeAcquisition, basePath, options, Diagnostics.Unknown_type_acquisition_option_0, errors);
 
-        const options: TypingOptions = { enableAutoDiscovery: getBaseFileName(configFileName) === "jsconfig.json", 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[]) {
+        defaultOptions: CompilerOptions | TypeAcquisition, diagnosticMessage: DiagnosticMessage, errors: Diagnostic[]) {
 
         if (!jsonOptions) {
             return;
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 99a26a13920..fd2740f20c2 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -371,7 +371,7 @@ namespace ts {
 
         function writeJsDocComments(declaration: Node) {
             if (declaration) {
-                const jsDocComments = getJsDocCommentsFromText(declaration, currentText);
+                const jsDocComments = getJSDocCommentRanges(declaration, currentText);
                 emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
                 // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
                 emitComments(currentText, currentLineMap, writer, jsDocComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeCommentRange);
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 3cb003902d1..43238defb93 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -855,6 +855,10 @@
         "category": "Error",
         "code": 1317
     },
+    "An abstract accessor cannot have an implementation.": {
+        "category": "Error",
+        "code": 1318
+    },
     "Duplicate identifier '{0}'.": {
         "category": "Error",
         "code": 2300
@@ -2027,6 +2031,10 @@
         "category": "Error",
         "code": 2701
     },
+    "'{0}' only refers to a type, but is being used as a namespace here.": {
+        "category": "Error",
+        "code": 2702
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
@@ -3177,7 +3185,7 @@
         "category": "Error",
         "code": 17009
     },
-    "Unknown typing option '{0}'.": {
+    "Unknown type acquisition option '{0}'.": {
         "category": "Error",
         "code": 17010
     },
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 89ceaaa94aa..c1fc9b60504 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -143,7 +143,7 @@ namespace ts {
 
             // Write the source map
             if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false);
+                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false, sourceFiles);
             }
 
             // Record source map data for the test harness.
@@ -152,7 +152,7 @@ namespace ts {
             }
 
             // Write the output file
-            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM);
+            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM, sourceFiles);
 
             // Reset state
             sourceMap.reset();
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index 518611b9e88..aa610ccc8a5 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -655,16 +655,16 @@ namespace ts {
         if (whenFalse) {
             // second overload
             node.questionToken = <QuestionToken>questionTokenOrWhenTrue;
-            node.whenTrue = whenTrueOrWhenFalse;
+            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
             node.colonToken = <ColonToken>colonTokenOrLocation;
-            node.whenFalse = whenFalse;
+            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenFalse);
         }
         else {
             // first overload
             node.questionToken = createToken(SyntaxKind.QuestionToken);
-            node.whenTrue = <Expression>questionTokenOrWhenTrue;
+            node.whenTrue = parenthesizeSubexpressionOfConditionalExpression(<Expression>questionTokenOrWhenTrue);
             node.colonToken = createToken(SyntaxKind.ColonToken);
-            node.whenFalse = whenTrueOrWhenFalse;
+            node.whenFalse = parenthesizeSubexpressionOfConditionalExpression(whenTrueOrWhenFalse);
         }
         return node;
     }
@@ -1683,16 +1683,10 @@ namespace ts {
 
     function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
         if (isQualifiedName(jsxFactory)) {
-            return createPropertyAccess(
-                createJsxFactoryExpressionFromEntityName(
-                    jsxFactory.left,
-                    parent
-                ),
-                setEmitFlags(
-                    getMutableClone(jsxFactory.right),
-                    EmitFlags.NoSourceMap
-                )
-            );
+            const left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
+            const right = <Identifier>createSynthesizedNode(SyntaxKind.Identifier);
+            right.text = jsxFactory.right.text;
+            return createPropertyAccess(left, right);
         }
         else {
             return createReactNamespace(jsxFactory.text, parent);
@@ -2547,6 +2541,15 @@ namespace ts {
         return condition;
     }
 
+    function parenthesizeSubexpressionOfConditionalExpression(e: Expression): Expression {
+        // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions
+        // so in case when comma expression is introduced as a part of previous transformations
+        // if should be wrapped in parens since comma operator has the lowest precedence
+        return e.kind === SyntaxKind.BinaryExpression && (<BinaryExpression>e).operatorToken.kind === SyntaxKind.CommaToken
+            ? createParen(e)
+            : e;
+    }
+
     /**
      * Wraps an expression in parentheses if it is needed in order to use the expression
      * as the expression of a NewExpression node.
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 7a9d50548b0..ab8f3d4c999 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -419,6 +419,8 @@ namespace ts {
                 return visitNode(cbNode, (<JSDocReturnTag>node).typeExpression);
             case SyntaxKind.JSDocTypeTag:
                 return visitNode(cbNode, (<JSDocTypeTag>node).typeExpression);
+            case SyntaxKind.JSDocAugmentsTag:
+                return visitNode(cbNode, (<JSDocAugmentsTag>node).typeExpression);
             case SyntaxKind.JSDocTemplateTag:
                 return visitNodes(cbNodes, (<JSDocTemplateTag>node).typeParameters);
             case SyntaxKind.JSDocTypedefTag:
@@ -682,7 +684,7 @@ namespace ts {
 
 
         function addJSDocComment<T extends Node>(node: T): T {
-            const comments = getJsDocCommentsFromText(node, sourceFile.text);
+            const comments = getJSDocCommentRanges(node, sourceFile.text);
             if (comments) {
                 for (const comment of comments) {
                     const jsDoc = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
@@ -690,10 +692,10 @@ namespace ts {
                         continue;
                     }
 
-                    if (!node.jsDocComments) {
-                        node.jsDocComments = [];
+                    if (!node.jsDoc) {
+                        node.jsDoc = [];
                     }
-                    node.jsDocComments.push(jsDoc);
+                    node.jsDoc.push(jsDoc);
                 }
             }
 
@@ -720,11 +722,11 @@ namespace ts {
                     const saveParent = parent;
                     parent = n;
                     forEachChild(n, visitNode);
-                    if (n.jsDocComments) {
-                        for (const jsDocComment of n.jsDocComments) {
-                            jsDocComment.parent = n;
-                            parent = jsDocComment;
-                            forEachChild(jsDocComment, visitNode);
+                    if (n.jsDoc) {
+                        for (const jsDoc of n.jsDoc) {
+                            jsDoc.parent = n;
+                            parent = jsDoc;
+                            forEachChild(jsDoc, visitNode);
                         }
                     }
                     parent = saveParent;
@@ -2557,6 +2559,8 @@ namespace ts {
                 case SyntaxKind.OpenBraceToken:
                 case SyntaxKind.OpenBracketToken:
                 case SyntaxKind.LessThanToken:
+                case SyntaxKind.BarToken:
+                case SyntaxKind.AmpersandToken:
                 case SyntaxKind.NewKeyword:
                 case SyntaxKind.StringLiteral:
                 case SyntaxKind.NumericLiteral:
@@ -2616,6 +2620,7 @@ namespace ts {
         }
 
         function parseUnionOrIntersectionType(kind: SyntaxKind, parseConstituentType: () => TypeNode, operator: SyntaxKind): TypeNode {
+            parseOptional(operator);
             let type = parseConstituentType();
             if (token() === operator) {
                 const types = createNodeArray<TypeNode>([type], type.pos);
@@ -6429,6 +6434,9 @@ namespace ts {
                     let tag: JSDocTag;
                     if (tagName) {
                         switch (tagName.text) {
+                            case "augments":
+                                tag = parseAugmentsTag(atToken, tagName);
+                                break;
                             case "param":
                                 tag = parseParamTag(atToken, tagName);
                                 break;
@@ -6645,6 +6653,16 @@ namespace ts {
                     return finishNode(result);
                 }
 
+                function parseAugmentsTag(atToken: AtToken, tagName: Identifier): JSDocAugmentsTag {
+                    const typeExpression = tryParseTypeExpression();
+
+                    const result = <JSDocAugmentsTag>createNode(SyntaxKind.JSDocAugmentsTag, atToken.pos);
+                    result.atToken = atToken;
+                    result.tagName = tagName;
+                    result.typeExpression = typeExpression;
+                    return finishNode(result);
+                }
+
                 function parseTypedefTag(atToken: AtToken, tagName: Identifier): JSDocTypedefTag {
                     const typeExpression = tryParseTypeExpression();
                     skipWhitespace();
@@ -6957,8 +6975,8 @@ namespace ts {
                 }
 
                 forEachChild(node, visitNode, visitArray);
-                if (node.jsDocComments) {
-                    for (const jsDocComment of node.jsDocComments) {
+                if (node.jsDoc) {
+                    for (const jsDocComment of node.jsDoc) {
                         forEachChild(jsDocComment, visitNode, visitArray);
                     }
                 }
diff --git a/src/compiler/transformers/destructuring.ts b/src/compiler/transformers/destructuring.ts
index 1e496ca84d3..bba71cd1743 100644
--- a/src/compiler/transformers/destructuring.ts
+++ b/src/compiler/transformers/destructuring.ts
@@ -478,7 +478,7 @@ namespace ts {
                 var t = {};
                 for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
                     t[p] = s[p];
-                if (typeof Object.getOwnPropertySymbols === "function")
+                if (s != null && typeof Object.getOwnPropertySymbols === "function")
                     for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
                         t[p[i]] = s[p[i]];
                 return t;
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 5bf9d0639bc..0fe2a53c91a 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -1353,13 +1353,13 @@ namespace ts {
             //       __metadata("design:type", Function),
             //       __metadata("design:paramtypes", [Object]),
             //       __metadata("design:returntype", void 0)
-            //   ], C.prototype, "method", undefined);
+            //   ], C.prototype, "method", null);
             //
             // The emit for an accessor is:
             //
             //   __decorate([
             //       dec
-            //   ], C.prototype, "accessor", undefined);
+            //   ], C.prototype, "accessor", null);
             //
             // The emit for a property is:
             //
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
index 10d4a0c1d36..a7304eebe4b 100644
--- a/src/compiler/tsc.ts
+++ b/src/compiler/tsc.ts
@@ -43,66 +43,6 @@ namespace ts {
         }
     }
 
-    /**
-     * Checks to see if the locale is in the appropriate format,
-     * and if it is, attempts to set the appropriate language.
-     */
-    function validateLocaleAndSetLanguage(locale: string, errors: Diagnostic[]): boolean {
-        const matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
-
-        if (!matchResult) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
-            return false;
-        }
-
-        const language = matchResult[1];
-        const territory = matchResult[3];
-
-        // First try the entire locale, then fall back to just language if that's all we have.
-        // Either ways do not fail, and fallback to the English diagnostic strings.
-        if (!trySetLanguageAndTerritory(language, territory, errors)) {
-            trySetLanguageAndTerritory(language, undefined, errors);
-        }
-
-        return true;
-    }
-
-    function trySetLanguageAndTerritory(language: string, territory: string, errors: Diagnostic[]): boolean {
-        const compilerFilePath = normalizePath(sys.getExecutingFilePath());
-        const containingDirectoryPath = getDirectoryPath(compilerFilePath);
-
-        let filePath = combinePaths(containingDirectoryPath, language);
-
-        if (territory) {
-            filePath = filePath + "-" + territory;
-        }
-
-        filePath = sys.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
-
-        if (!sys.fileExists(filePath)) {
-            return false;
-        }
-
-        // TODO: Add codePage support for readFile?
-        let fileContents = "";
-        try {
-            fileContents = sys.readFile(filePath);
-        }
-        catch (e) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Unable_to_open_file_0, filePath));
-            return false;
-        }
-        try {
-            ts.localizedDiagnosticMessages = JSON.parse(fileContents);
-        }
-        catch (e) {
-            errors.push(createCompilerDiagnostic(Diagnostics.Corrupted_locale_file_0, filePath));
-            return false;
-        }
-
-        return true;
-    }
-
     function countLines(program: Program): number {
         let count = 0;
         forEach(program.getSourceFiles(), file => {
@@ -263,7 +203,7 @@ namespace ts {
                 reportDiagnostic(createCompilerDiagnostic(Diagnostics.The_current_host_does_not_support_the_0_option, "--locale"), /* host */ undefined);
                 return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
             }
-            validateLocaleAndSetLanguage(commandLine.options.locale, commandLine.errors);
+            validateLocaleAndSetLanguage(commandLine.options.locale, sys, commandLine.errors);
         }
 
         // If there are any errors due to command line parsing and/or
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 4f4c39bc79a..d1202465a93 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -349,6 +349,7 @@ namespace ts {
         JSDocThisType,
         JSDocComment,
         JSDocTag,
+        JSDocAugmentsTag,
         JSDocParameterTag,
         JSDocReturnTag,
         JSDocTypeTag,
@@ -491,7 +492,8 @@ namespace ts {
         parent?: Node;                                  // Parent node (initialized by binding)
         /* @internal */ original?: Node;                // The original node if this is an updated node.
         /* @internal */ startsOnNewLine?: boolean;      // Whether a synthesized node should start on a new line (used by transforms).
-        /* @internal */ jsDocComments?: JSDoc[];        // JSDoc for the node, if it has any.
+        /* @internal */ jsDoc?: JSDoc[];                // JSDoc that directly precedes this node
+        /* @internal */ jsDocCache?: (JSDoc | JSDocTag)[]; // All JSDoc that applies to the node, including parent docs and @param tags
         /* @internal */ symbol?: Symbol;                // Symbol declared by node (initialized by binding)
         /* @internal */ locals?: SymbolTable;           // Locals associated with node (initialized by binding)
         /* @internal */ nextContainer?: Node;           // Next container in declaration order (initialized by binding)
@@ -1990,6 +1992,11 @@ namespace ts {
         kind: SyntaxKind.JSDocTag;
     }
 
+    export interface JSDocAugmentsTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAugmentsTag;
+        typeExpression: JSDocTypeExpression;
+    }
+
     export interface JSDocTemplateTag extends JSDocTag {
         kind: SyntaxKind.JSDocTemplateTag;
         typeParameters: NodeArray<TypeParameterDeclaration>;
@@ -2791,7 +2798,7 @@ namespace ts {
         Intrinsic = Any | String | Number | Boolean | BooleanLiteral | ESSymbol | Void | Undefined | Null | Never,
         /* @internal */
         Primitive = String | Number | Boolean | Enum | ESSymbol | Void | Undefined | Null | Literal,
-        StringLike = String | StringLiteral,
+        StringLike = String | StringLiteral | Index,
         NumberLike = Number | NumberLiteral | Enum | EnumLiteral,
         BooleanLike = Boolean | BooleanLiteral,
         EnumLike = Enum | EnumLiteral,
@@ -3215,8 +3222,12 @@ namespace ts {
         [option: string]: CompilerOptionsValue | undefined;
     }
 
-    export interface TypingOptions {
+    export interface TypeAcquisition {
+        /* @deprecated typingOptions.enableAutoDiscovery
+         * Use typeAcquisition.enable instead.
+         */
         enableAutoDiscovery?: boolean;
+        enable?: boolean;
         include?: string[];
         exclude?: string[];
         [option: string]: string[] | boolean | undefined;
@@ -3227,7 +3238,7 @@ namespace ts {
         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
+        typeAcquisition: TypeAcquisition;               // Used to customize the type acquisition process
         compilerOptions: CompilerOptions;               // Used as a source for typing inference
         unresolvedImports: ReadonlyArray<string>;       // List of unresolved module ids from imports
     }
@@ -3292,7 +3303,7 @@ namespace ts {
     /** Either a parsed command line or a parsed tsconfig.json */
     export interface ParsedCommandLine {
         options: CompilerOptions;
-        typingOptions?: TypingOptions;
+        typeAcquisition?: TypeAcquisition;
         fileNames: string[];
         raw?: any;
         errors: Diagnostic[];
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index c484e85689b..3837e707564 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -239,7 +239,7 @@ namespace ts {
         return !nodeIsMissing(node);
     }
 
-    export function getTokenPosOfNode(node: Node, sourceFile?: SourceFile, includeJsDocComment?: boolean): number {
+    export function getTokenPosOfNode(node: Node, sourceFile?: SourceFile, includeJsDoc?: boolean): number {
         // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't*
         // want to skip trivia because this will launch us forward to the next token.
         if (nodeIsMissing(node)) {
@@ -250,8 +250,8 @@ namespace ts {
             return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
 
-        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
-            return getTokenPosOfNode(node.jsDocComments[0]);
+        if (includeJsDoc && node.jsDoc && node.jsDoc.length > 0) {
+            return getTokenPosOfNode(node.jsDoc[0]);
         }
 
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
@@ -259,7 +259,7 @@ namespace ts {
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
         if (node.kind === SyntaxKind.SyntaxList && (<SyntaxList>node)._children.length > 0) {
-            return getTokenPosOfNode((<SyntaxList>node)._children[0], sourceFile, includeJsDocComment);
+            return getTokenPosOfNode((<SyntaxList>node)._children[0], sourceFile, includeJsDoc);
         }
 
         return skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -476,15 +476,15 @@ namespace ts {
 
     export function getTextOfPropertyName(name: PropertyName): string {
         switch (name.kind) {
-        case SyntaxKind.Identifier:
-            return (<Identifier>name).text;
-        case SyntaxKind.StringLiteral:
-        case SyntaxKind.NumericLiteral:
-            return (<LiteralExpression>name).text;
-        case SyntaxKind.ComputedPropertyName:
-            if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression)) {
-                return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
-            }
+            case SyntaxKind.Identifier:
+                return (<Identifier>name).text;
+            case SyntaxKind.StringLiteral:
+            case SyntaxKind.NumericLiteral:
+                return (<LiteralExpression>name).text;
+            case SyntaxKind.ComputedPropertyName:
+                if (isStringOrNumericLiteral((<ComputedPropertyName>name).expression)) {
+                    return (<LiteralExpression>(<ComputedPropertyName>name).expression).text;
+                }
         }
 
         return undefined;
@@ -628,25 +628,18 @@ namespace ts {
         return getLeadingCommentRanges(text, node.pos);
     }
 
-    export function getJsDocComments(node: Node, sourceFileOfNode: SourceFile) {
-        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
-    }
-
-    export function getJsDocCommentsFromText(node: Node, text: string) {
+    export function getJSDocCommentRanges(node: Node, text: string) {
         const commentRanges = (node.kind === SyntaxKind.Parameter ||
             node.kind === SyntaxKind.TypeParameter ||
             node.kind === SyntaxKind.FunctionExpression ||
             node.kind === SyntaxKind.ArrowFunction) ?
             concatenate(getTrailingCommentRanges(text, node.pos), getLeadingCommentRanges(text, node.pos)) :
             getLeadingCommentRangesOfNodeFromText(node, text);
-        return filter(commentRanges, isJsDocComment);
-
-        function isJsDocComment(comment: CommentRange) {
-            // True if the comment starts with '/**' but not if it is '/**/'
-            return text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
-                text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
-                text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash;
-        }
+        // True if the comment starts with '/**' but not if it is '/**/'
+        return filter(commentRanges, comment =>
+            text.charCodeAt(comment.pos + 1) === CharacterCodes.asterisk &&
+            text.charCodeAt(comment.pos + 2) === CharacterCodes.asterisk &&
+            text.charCodeAt(comment.pos + 3) !== CharacterCodes.slash);
     }
 
     export let fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
@@ -1440,57 +1433,42 @@ namespace ts {
             (<JSDocFunctionType>node).parameters[0].type.kind === SyntaxKind.JSDocConstructorType;
     }
 
-    function getJSDocTag(node: Node, kind: SyntaxKind, checkParentVariableStatement: boolean): JSDocTag {
-        if (!node) {
-            return undefined;
-        }
-
-        const jsDocTags = getJSDocTags(node, checkParentVariableStatement);
-        if (!jsDocTags) {
-            return undefined;
-        }
-
-        for (const tag of jsDocTags) {
-            if (tag.kind === kind) {
-                return tag;
-            }
-        }
+    export function getCommentsFromJSDoc(node: Node): string[] {
+        return map(getJSDocs(node), doc => doc.comment);
     }
 
-    function append<T>(previous: T[] | undefined, additional: T[] | undefined): T[] | undefined {
-        if (additional) {
-            if (!previous) {
-                previous = [];
-            }
-            for (const x of additional) {
-                previous.push(x);
-            }
-        }
-        return previous;
-    }
-
-    export function getJSDocComments(node: Node, checkParentVariableStatement: boolean): string[] {
-        return getJSDocs(node, checkParentVariableStatement, docs => map(docs, doc => doc.comment), tags => map(tags, tag => tag.comment));
-    }
-
-    function getJSDocTags(node: Node, checkParentVariableStatement: boolean): JSDocTag[] {
-        return getJSDocs(node, checkParentVariableStatement, docs => {
+    function getJSDocTags(node: Node, kind: SyntaxKind): JSDocTag[] {
+        const docs = getJSDocs(node);
+        if (docs) {
             const result: JSDocTag[] = [];
             for (const doc of docs) {
-                if (doc.tags) {
-                    result.push(...doc.tags);
+                if (doc.kind === SyntaxKind.JSDocParameterTag) {
+                    if (doc.kind === kind) {
+                        result.push(doc as JSDocTag);
+                    }
+                }
+                else {
+                    result.push(...filter((doc as JSDoc).tags, tag => tag.kind === kind));
                 }
             }
             return result;
-        }, tags => tags);
+        }
     }
 
-    function getJSDocs<T>(node: Node, checkParentVariableStatement: boolean, getDocs: (docs: JSDoc[]) => T[], getTags: (tags: JSDocTag[]) => T[]): T[] {
-        // TODO: Get rid of getJsDocComments and friends (note the lowercase 's' in Js)
-        // TODO: A lot of this work should be cached, maybe. I guess it's only used in services right now...
-        let result: T[] = undefined;
-        // prepend documentation from parent sources
-        if (checkParentVariableStatement) {
+    function getFirstJSDocTag(node: Node, kind: SyntaxKind): JSDocTag {
+        return node && firstOrUndefined(getJSDocTags(node, kind));
+    }
+
+   function getJSDocs(node: Node): (JSDoc | JSDocTag)[] {
+        let cache: (JSDoc | JSDocTag)[] = node.jsDocCache;
+        if (!cache) {
+            getJSDocsWorker(node);
+            node.jsDocCache = cache;
+        }
+        return cache;
+
+        function getJSDocsWorker(node: Node) {
+            const parent = node.parent;
             // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
             // /**
             //   * @param {number} name
@@ -1498,68 +1476,55 @@ namespace ts {
             //   */
             // var x = function(name) { return name.length; }
             const isInitializerOfVariableDeclarationInStatement =
-                isVariableLike(node.parent) &&
-                (node.parent).initializer === node &&
-                node.parent.parent.parent.kind === SyntaxKind.VariableStatement;
+                isVariableLike(parent) &&
+                parent.initializer === node &&
+                parent.parent.parent.kind === SyntaxKind.VariableStatement;
             const isVariableOfVariableDeclarationStatement = isVariableLike(node) &&
-                node.parent.parent.kind === SyntaxKind.VariableStatement;
-
+                parent.parent.kind === SyntaxKind.VariableStatement;
             const variableStatementNode =
-                isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent :
-                    isVariableOfVariableDeclarationStatement ? node.parent.parent :
-                        undefined;
+                isInitializerOfVariableDeclarationInStatement ? parent.parent.parent :
+                isVariableOfVariableDeclarationStatement ? parent.parent :
+                undefined;
             if (variableStatementNode) {
-                result = append(result, getJSDocs(variableStatementNode, checkParentVariableStatement, getDocs, getTags));
-            }
-            if (node.kind === SyntaxKind.ModuleDeclaration &&
-                node.parent && node.parent.kind === SyntaxKind.ModuleDeclaration) {
-                result = append(result, getJSDocs(node.parent, checkParentVariableStatement, getDocs, getTags));
+                getJSDocsWorker(variableStatementNode);
             }
 
             // Also recognize when the node is the RHS of an assignment expression
-            const parent = node.parent;
             const isSourceOfAssignmentExpressionStatement =
                 parent && parent.parent &&
                 parent.kind === SyntaxKind.BinaryExpression &&
                 (parent as BinaryExpression).operatorToken.kind === SyntaxKind.EqualsToken &&
                 parent.parent.kind === SyntaxKind.ExpressionStatement;
             if (isSourceOfAssignmentExpressionStatement) {
-                result = append(result, getJSDocs(parent.parent, checkParentVariableStatement, getDocs, getTags));
+                getJSDocsWorker(parent.parent);
             }
 
+            const isModuleDeclaration = node.kind === SyntaxKind.ModuleDeclaration &&
+                parent && parent.kind === SyntaxKind.ModuleDeclaration;
             const isPropertyAssignmentExpression = parent && parent.kind === SyntaxKind.PropertyAssignment;
-            if (isPropertyAssignmentExpression) {
-                result = append(result, getJSDocs(parent, checkParentVariableStatement, getDocs, getTags));
+            if (isModuleDeclaration || isPropertyAssignmentExpression) {
+                getJSDocsWorker(parent);
             }
 
             // Pull parameter comments from declaring function as well
             if (node.kind === SyntaxKind.Parameter) {
-                const paramTags = getJSDocParameterTag(node as ParameterDeclaration, checkParentVariableStatement);
-                if (paramTags) {
-                    result = append(result, getTags(paramTags));
-                }
+                cache = concatenate(cache, getJSDocParameterTags(node));
             }
-        }
 
-        if (isVariableLike(node) && node.initializer) {
-            result = append(result, getJSDocs(node.initializer, /*checkParentVariableStatement*/ false, getDocs, getTags));
-        }
-
-        if (node.jsDocComments) {
-            if (result) {
-                result = append(result, getDocs(node.jsDocComments));
+            if (isVariableLike(node) && node.initializer) {
+                cache = concatenate(cache, node.initializer.jsDoc);
             }
-            else {
-                return getDocs(node.jsDocComments);
-            }
-        }
 
-        return result;
+            cache = concatenate(cache, node.jsDoc);
+        }
     }
 
-    function getJSDocParameterTag(param: ParameterDeclaration, checkParentVariableStatement: boolean): JSDocTag[] {
+    export function getJSDocParameterTags(param: Node): JSDocParameterTag[] {
+        if (!isParameter(param)) {
+            return undefined;
+        }
         const func = param.parent as FunctionLikeDeclaration;
-        const tags = getJSDocTags(func, checkParentVariableStatement);
+        const tags = getJSDocTags(func, SyntaxKind.JSDocParameterTag) as JSDocParameterTag[];
         if (!param.name) {
             // this is an anonymous jsdoc param from a `function(type1, type2): type3` specification
             const i = func.parameters.indexOf(param);
@@ -1570,10 +1535,7 @@ namespace ts {
         }
         else if (param.name.kind === SyntaxKind.Identifier) {
             const name = (param.name as Identifier).text;
-            const paramTags = filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && (tag as JSDocParameterTag).parameterName.text === name);
-            if (paramTags) {
-                return paramTags;
-            }
+            return filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.parameterName.text === name);
         }
         else {
             // TODO: it's a destructured parameter, so it should look up an "object type" series of multiple lines
@@ -1582,39 +1544,28 @@ namespace ts {
         }
     }
 
-    export function getJSDocTypeTag(node: Node): JSDocTypeTag {
-        return <JSDocTypeTag>getJSDocTag(node, SyntaxKind.JSDocTypeTag, /*checkParentVariableStatement*/ false);
-    }
-
-    export function getJSDocReturnTag(node: Node): JSDocReturnTag {
-        return <JSDocReturnTag>getJSDocTag(node, SyntaxKind.JSDocReturnTag, /*checkParentVariableStatement*/ true);
-    }
-
-    export function getJSDocTemplateTag(node: Node): JSDocTemplateTag {
-        return <JSDocTemplateTag>getJSDocTag(node, SyntaxKind.JSDocTemplateTag, /*checkParentVariableStatement*/ false);
-    }
-
-    export function getCorrespondingJSDocParameterTag(parameter: ParameterDeclaration): JSDocParameterTag {
-        if (parameter.name && parameter.name.kind === SyntaxKind.Identifier) {
-            // If it's a parameter, see if the parent has a jsdoc comment with an @param
-            // annotation.
-            const parameterName = (<Identifier>parameter.name).text;
-
-            const jsDocTags = getJSDocTags(parameter.parent, /*checkParentVariableStatement*/ true);
-            if (!jsDocTags) {
-                return undefined;
-            }
-            for (const tag of jsDocTags) {
-                if (tag.kind === SyntaxKind.JSDocParameterTag) {
-                    const parameterTag = <JSDocParameterTag>tag;
-                    if (parameterTag.parameterName.text === parameterName) {
-                        return parameterTag;
-                    }
-                }
+    export function getJSDocType(node: Node): JSDocType {
+        let tag: JSDocTypeTag | JSDocParameterTag = getFirstJSDocTag(node, SyntaxKind.JSDocTypeTag) as JSDocTypeTag;
+        if (!tag && node.kind === SyntaxKind.Parameter) {
+            const paramTags = getJSDocParameterTags(node);
+            if (paramTags) {
+                tag = find(paramTags, tag => !!tag.typeExpression);
             }
         }
 
-        return undefined;
+        return tag && tag.typeExpression && tag.typeExpression.type;
+    }
+
+    export function getJSDocAugmentsTag(node: Node): JSDocAugmentsTag {
+        return getFirstJSDocTag(node, SyntaxKind.JSDocAugmentsTag) as JSDocAugmentsTag;
+    }
+
+    export function getJSDocReturnTag(node: Node): JSDocReturnTag {
+        return getFirstJSDocTag(node, SyntaxKind.JSDocReturnTag) as JSDocReturnTag;
+    }
+
+    export function getJSDocTemplateTag(node: Node): JSDocTemplateTag {
+        return getFirstJSDocTag(node, SyntaxKind.JSDocTemplateTag) as JSDocTemplateTag;
     }
 
     export function hasRestParameter(s: SignatureDeclaration): boolean {
@@ -1627,14 +1578,11 @@ namespace ts {
 
     export function isRestParameter(node: ParameterDeclaration) {
         if (node && (node.flags & NodeFlags.JavaScriptFile)) {
-            if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType) {
+            if (node.type && node.type.kind === SyntaxKind.JSDocVariadicType ||
+                forEach(getJSDocParameterTags(node),
+                        t => t.typeExpression && t.typeExpression.type.kind === SyntaxKind.JSDocVariadicType)) {
                 return true;
             }
-
-            const paramTag = getCorrespondingJSDocParameterTag(node);
-            if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === SyntaxKind.JSDocVariadicType;
-            }
         }
         return isDeclaredRestParam(node);
     }
@@ -4613,4 +4561,71 @@ namespace ts {
 
         return flags;
     }
+
+    /**
+      * Checks to see if the locale is in the appropriate format,
+      * and if it is, attempts to set the appropriate language.
+      */
+    export function validateLocaleAndSetLanguage(
+        locale: string,
+        sys: { getExecutingFilePath(): string, resolvePath(path: string): string, fileExists(fileName: string): boolean, readFile(fileName: string): string },
+        errors?: Diagnostic[]) {
+        const matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
+
+        if (!matchResult) {
+            if (errors) {
+                errors.push(createCompilerDiagnostic(Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
+            }
+            return;
+        }
+
+        const language = matchResult[1];
+        const territory = matchResult[3];
+
+        // First try the entire locale, then fall back to just language if that's all we have.
+        // Either ways do not fail, and fallback to the English diagnostic strings.
+        if (!trySetLanguageAndTerritory(language, territory, errors)) {
+            trySetLanguageAndTerritory(language, /*territory*/ undefined, errors);
+        }
+
+        function trySetLanguageAndTerritory(language: string, territory: string, errors?: Diagnostic[]): boolean {
+            const compilerFilePath = normalizePath(sys.getExecutingFilePath());
+            const containingDirectoryPath = getDirectoryPath(compilerFilePath);
+
+            let filePath = combinePaths(containingDirectoryPath, language);
+
+            if (territory) {
+                filePath = filePath + "-" + territory;
+            }
+
+            filePath = sys.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
+
+            if (!sys.fileExists(filePath)) {
+                return false;
+            }
+
+            // TODO: Add codePage support for readFile?
+            let fileContents = "";
+            try {
+                fileContents = sys.readFile(filePath);
+            }
+            catch (e) {
+                if (errors) {
+                    errors.push(createCompilerDiagnostic(Diagnostics.Unable_to_open_file_0, filePath));
+                }
+                return false;
+            }
+            try {
+                ts.localizedDiagnosticMessages = JSON.parse(fileContents);
+            }
+            catch (e) {
+                if (errors) {
+                    errors.push(createCompilerDiagnostic(Diagnostics.Corrupted_locale_file_0, filePath));
+                }
+                return false;
+            }
+
+            return true;
+        }
+    }
 }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index 88346557ba7..26a4a6f963d 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -2015,7 +2015,7 @@ namespace Harness {
 
     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 = ts.getBaseFileName(filePath);
+        const fileName = ts.getBaseFileName(ts.normalizeSlashes(filePath));
         return ts.startsWith(fileName, "lib.") && ts.endsWith(fileName, ".d.ts");
     }
 
diff --git a/src/harness/rwcRunner.ts b/src/harness/rwcRunner.ts
index 9f9bf8589f0..44d2c981c84 100644
--- a/src/harness/rwcRunner.ts
+++ b/src/harness/rwcRunner.ts
@@ -199,7 +199,7 @@ namespace RWC {
                     }
                     // Do not include the library in the baselines to avoid noise
                     const baselineFiles = inputFiles.concat(otherFiles).filter(f => !Harness.isDefaultLibraryFile(f.unitName));
-                    const errors = compilerResult.errors.filter(e => !Harness.isDefaultLibraryFile(e.file.fileName));
+                    const errors = compilerResult.errors.filter(e => e.file && !Harness.isDefaultLibraryFile(e.file.fileName));
                     return Harness.Compiler.getErrorBaseline(baselineFiles, errors);
                 }, baselineOpts);
             });
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
index d3a814f26ca..f4057057e4e 100644
--- a/src/harness/tsconfig.json
+++ b/src/harness/tsconfig.json
@@ -108,7 +108,7 @@
         "./unittests/commandLineParsing.ts",
         "./unittests/configurationExtension.ts",
         "./unittests/convertCompilerOptionsFromJson.ts",
-        "./unittests/convertTypingOptionsFromJson.ts",
+        "./unittests/convertTypeAcquisitionFromJson.ts",
         "./unittests/tsserverProjectSystem.ts",
         "./unittests/matchFiles.ts",
         "./unittests/initializeTSConfig.ts",
diff --git a/src/harness/unittests/convertTypingOptionsFromJson.ts b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
similarity index 53%
rename from src/harness/unittests/convertTypingOptionsFromJson.ts
rename to src/harness/unittests/convertTypeAcquisitionFromJson.ts
index 439409b24b7..4c21b7ca2b9 100644
--- a/src/harness/unittests/convertTypingOptionsFromJson.ts
+++ b/src/harness/unittests/convertTypeAcquisitionFromJson.ts
@@ -2,12 +2,13 @@
 /// <reference path="..\..\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);
+    describe("convertTypeAcquisitionFromJson", () => {
+        function assertTypeAcquisition(json: any, configFileName: string, expectedResult: { typeAcquisition: TypeAcquisition, errors: Diagnostic[] }) {
+            const jsonOptions = json["typeAcquisition"] || json["typingOptions"];
+            const { options: actualTypeAcquisition, errors: actualErrors } = convertTypeAcquisitionFromJson(jsonOptions, "/apath/", configFileName);
+            const parsedTypeAcquisition = JSON.stringify(actualTypeAcquisition);
+            const expectedTypeAcquisition = JSON.stringify(expectedResult.typeAcquisition);
+            assert.equal(parsedTypeAcquisition, expectedTypeAcquisition);
 
             const expectedErrors = expectedResult.errors;
             assert.isTrue(expectedResult.errors.length === actualErrors.length, `Expected error: ${JSON.stringify(expectedResult.errors)}. Actual error: ${JSON.stringify(actualErrors)}.`);
@@ -20,8 +21,8 @@ namespace ts {
         }
 
         // tsconfig.json
-        it("Convert correctly format tsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert deprecated typingOptions.enableAutoDiscovery format tsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
                     "typingOptions":
                     {
@@ -32,9 +33,9 @@ namespace ts {
                 },
                 "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: ["0.d.ts", "1.d.ts"],
                         exclude: ["0.js", "1.js"]
                     },
@@ -42,25 +43,47 @@ namespace ts {
             });
         });
 
-        it("Convert incorrect format tsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert correctly format tsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
+                    {
+                        "enable": true,
+                        "include": ["0.d.ts", "1.d.ts"],
+                        "exclude": ["0.js", "1.js"]
+                    }
+                },
+                "tsconfig.json",
+                {
+                    typeAcquisition:
+                    {
+                        enable: true,
+                        include: ["0.d.ts", "1.d.ts"],
+                        exclude: ["0.js", "1.js"]
+                    },
+                    errors: <Diagnostic[]>[]
+            });
+        });
+
+        it("Convert incorrect format tsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
+                {
+                    "typeAcquisition":
                     {
                         "enableAutoDiscovy": true,
                     }
                 }, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
                     errors: [
                         {
-                            category: Diagnostics.Unknown_typing_option_0.category,
-                            code: Diagnostics.Unknown_typing_option_0.code,
+                            category: Diagnostics.Unknown_type_acquisition_option_0.category,
+                            code: Diagnostics.Unknown_type_acquisition_option_0.code,
                             file: undefined,
                             start: 0,
                             length: 0,
@@ -70,12 +93,12 @@ namespace ts {
                 });
         });
 
-        it("Convert default tsconfig.json to typing-options ", () => {
-            assertTypingOptions({}, "tsconfig.json",
+        it("Convert default tsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition({}, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
@@ -83,18 +106,18 @@ namespace ts {
                 });
         });
 
-        it("Convert tsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert tsconfig.json with only enable property to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": true
+                        "enable": true
                     }
                 }, "tsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
@@ -103,20 +126,20 @@ namespace ts {
         });
 
         // jsconfig.json
-        it("Convert jsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert jsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": false,
+                        "enable": false,
                         "include": ["0.d.ts"],
                         "exclude": ["0.js"]
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: ["0.d.ts"],
                         exclude: ["0.js"]
                     },
@@ -124,12 +147,12 @@ namespace ts {
                 });
         });
 
-        it("Convert default jsconfig.json to typing-options ", () => {
-            assertTypingOptions({ }, "jsconfig.json",
+        it("Convert default jsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition({ }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
@@ -137,25 +160,25 @@ namespace ts {
                 });
         });
 
-        it("Convert incorrect format jsconfig.json to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert incorrect format jsconfig.json to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
                         "enableAutoDiscovy": true,
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: true,
+                        enable: true,
                         include: [],
                         exclude: []
                     },
                     errors: [
                         {
                             category: Diagnostics.Unknown_compiler_option_0.category,
-                            code: Diagnostics.Unknown_typing_option_0.code,
+                            code: Diagnostics.Unknown_type_acquisition_option_0.code,
                             file: undefined,
                             start: 0,
                             length: 0,
@@ -165,18 +188,18 @@ namespace ts {
                 });
         });
 
-        it("Convert jsconfig.json with only enableAutoDiscovery property to typing-options ", () => {
-            assertTypingOptions(
+        it("Convert jsconfig.json with only enable property to typeAcquisition ", () => {
+            assertTypeAcquisition(
                 {
-                    "typingOptions":
+                    "typeAcquisition":
                     {
-                        "enableAutoDiscovery": false
+                        "enable": false
                     }
                 }, "jsconfig.json",
                 {
-                    typingOptions:
+                    typeAcquisition:
                     {
-                        enableAutoDiscovery: false,
+                        enable: false,
                         include: [],
                         exclude: []
                     },
diff --git a/src/harness/unittests/matchFiles.ts b/src/harness/unittests/matchFiles.ts
index b514ac142c5..c562fcefe91 100644
--- a/src/harness/unittests/matchFiles.ts
+++ b/src/harness/unittests/matchFiles.ts
@@ -89,8 +89,6 @@ namespace ts {
         "c:/dev/g.min.js/.g/g.ts"
     ]);
 
-    const defaultExcludes = ["node_modules", "bower_components", "jspm_packages"];
-
     function assertParsed(actual: ts.ParsedCommandLine, expected: ts.ParsedCommandLine): void {
         assert.deepEqual(actual.fileNames, expected.fileNames);
         assert.deepEqual(actual.wildcardDirectories, expected.wildcardDirectories);
@@ -98,6 +96,23 @@ namespace ts {
     }
 
     describe("matchFiles", () => {
+        it("with defaults", () => {
+            const json = {};
+            const expected: ts.ParsedCommandLine = {
+                options: {},
+                errors: [],
+                fileNames: [
+                    "c:/dev/a.ts",
+                    "c:/dev/b.ts"
+                ],
+                wildcardDirectories: {
+                    "c:/dev": ts.WatchDirectoryFlags.Recursive
+                },
+            };
+            const actual = ts.parseJsonConfigFileContent(json, caseInsensitiveCommonFoldersHost, caseInsensitiveBasePath);
+            assertParsed(actual, expected);
+        });
+
         describe("with literal file list", () => {
             it("without exclusions", () => {
                 const json = {
@@ -192,7 +207,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {},
@@ -211,7 +226,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {},
@@ -330,7 +345,10 @@ namespace ts {
                     errors: [],
                     fileNames: [
                         "c:/dev/a.ts",
-                        "c:/dev/b.ts"
+                        "c:/dev/b.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
                     ],
                     wildcardDirectories: {},
                 };
@@ -372,8 +390,7 @@ namespace ts {
                         "node_modules/a.ts",
                         "bower_components/a.ts",
                         "jspm_packages/a.ts"
-                    ],
-                    exclude: <string[]>[]
+                    ]
                 };
                 const expected: ts.ParsedCommandLine = {
                     options: {},
@@ -530,7 +547,7 @@ namespace ts {
                     options: {},
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {
@@ -600,7 +617,10 @@ namespace ts {
                     options: {},
                     errors: [],
                     fileNames: [
-                        "c:/dev/a.ts"
+                        "c:/dev/a.ts",
+                        "c:/dev/bower_components/a.ts",
+                        "c:/dev/jspm_packages/a.ts",
+                        "c:/dev/node_modules/a.ts"
                     ],
                     wildcardDirectories: {
                         "c:/dev": ts.WatchDirectoryFlags.Recursive
@@ -671,7 +691,7 @@ namespace ts {
                     },
                     errors: [
                         ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                            caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                     ],
                     fileNames: [],
                     wildcardDirectories: {
@@ -980,7 +1000,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1022,7 +1042,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, "**/x/**/*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1071,7 +1091,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/../*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
@@ -1091,7 +1111,7 @@ namespace ts {
                         errors: [
                             ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, "**/y/../*"),
                             ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2,
-                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), JSON.stringify(defaultExcludes))
+                                caseInsensitiveTsconfigPath, JSON.stringify(json.include), "[]")
                         ],
                         fileNames: [],
                         wildcardDirectories: {}
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index e9b6ccb7884..368d2a660d4 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -51,9 +51,8 @@ namespace ts.projectSystem {
             throttleLimit: number,
             installTypingHost: server.ServerHost,
             readonly typesRegistry = createMap<void>(),
-            telemetryEnabled?: boolean,
             log?: TI.Log) {
-            super(installTypingHost, globalTypingsCacheLocation, safeList.path, throttleLimit, telemetryEnabled, log);
+            super(installTypingHost, globalTypingsCacheLocation, safeList.path, throttleLimit, log);
         }
 
         safeFileList = safeList.path;
@@ -90,8 +89,8 @@ namespace ts.projectSystem {
             this.projectService.updateTypingsForProject(response);
         }
 
-        enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
-            const request = server.createInstallTypingsRequest(project, typingOptions, unresolvedImports, this.globalTypingsCacheLocation);
+        enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
+            const request = server.createInstallTypingsRequest(project, typeAcquisition, unresolvedImports, this.globalTypingsCacheLocation);
             this.install(request);
         }
 
@@ -578,6 +577,35 @@ namespace ts.projectSystem {
             checkWatchedDirectories(host, ["/a/b/c", "/a/b", "/a"]);
         });
 
+        it("can handle tsconfig file name with difference casing", () => {
+            const f1 = {
+                path: "/a/b/app.ts",
+                content: "let x = 1"
+            };
+            const config = {
+                path: "/a/b/tsconfig.json",
+                content: JSON.stringify({
+                    include: []
+                })
+            };
+
+            const host = createServerHost([f1, config], { useCaseSensitiveFileNames: false });
+            const service = createProjectService(host);
+            service.openExternalProject(<protocol.ExternalProject>{
+                projectFileName: "/a/b/project.csproj",
+                rootFiles: toExternalFiles([f1.path, combinePaths(getDirectoryPath(config.path).toUpperCase(), getBaseFileName(config.path))]),
+                options: {}
+            });
+            service.checkNumberOfProjects({ configuredProjects: 1 });
+            checkProjectActualFiles(service.configuredProjects[0], []);
+
+            service.openClientFile(f1.path);
+            service.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: 1 });
+
+            checkProjectActualFiles(service.configuredProjects[0], []);
+            checkProjectActualFiles(service.inferredProjects[0], [f1.path]);
+        })
+
         it("create configured project without file list", () => {
             const configFile: FileOrFolder = {
                 path: "/a/b/tsconfig.json",
@@ -1726,8 +1754,8 @@ namespace ts.projectSystem {
                 options: {}
             });
             projectService.checkNumberOfProjects({ externalProjects: 1 });
-            const typingOptions = projectService.externalProjects[0].getTypingOptions();
-            assert.isTrue(typingOptions.enableAutoDiscovery, "Typing autodiscovery should be enabled");
+            const typeAcquisition = projectService.externalProjects[0].getTypeAcquisition();
+            assert.isTrue(typeAcquisition.enable, "Typine acquisition should be enabled");
         });
     });
 
@@ -2452,6 +2480,43 @@ namespace ts.projectSystem {
             openFilesForSession([file], session);
             serverEventManager.checkEventCountOfType("configFileDiag", 1);
         });
+
+        it("are generated when the config file changes", () => {
+            const serverEventManager = new TestServerEventManager();
+            const file = {
+                path: "/a/b/app.ts",
+                content: "let x = 10"
+            };
+            const configFile = {
+                path: "/a/b/tsconfig.json",
+                content: `{
+                    "compilerOptions": {}
+                }`
+            };
+
+            const host = createServerHost([file, configFile]);
+            const session = createSession(host, /*typingsInstaller*/ undefined, serverEventManager.handler);
+            openFilesForSession([file], session);
+            serverEventManager.checkEventCountOfType("configFileDiag", 1);
+
+            configFile.content = `{
+                "compilerOptions": {
+                    "haha": 123
+                }
+            }`;
+            host.reloadFS([file, configFile]);
+            host.triggerFileWatcherCallback(configFile.path);
+            host.runQueuedTimeoutCallbacks();
+            serverEventManager.checkEventCountOfType("configFileDiag", 2);
+
+            configFile.content = `{
+                "compilerOptions": {}
+            }`;
+            host.reloadFS([file, configFile]);
+            host.triggerFileWatcherCallback(configFile.path);
+            host.runQueuedTimeoutCallbacks();
+            serverEventManager.checkEventCountOfType("configFileDiag", 3);
+        });
     });
 
     describe("skipLibCheck", () => {
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
index 2dda506ad58..62d2f7ac801 100644
--- a/src/harness/unittests/typingsInstaller.ts
+++ b/src/harness/unittests/typingsInstaller.ts
@@ -20,13 +20,12 @@ namespace ts.projectSystem {
     }
 
     class Installer extends TestTypingsInstaller {
-        constructor(host: server.ServerHost, p?: InstallerParams, telemetryEnabled?: boolean, log?: TI.Log) {
+        constructor(host: server.ServerHost, p?: InstallerParams, log?: TI.Log) {
             super(
                 (p && p.globalTypingsCacheLocation) || "/a/data",
                 (p && p.throttleLimit) || 5,
                 host,
                 (p && p.typesRegistry),
-                telemetryEnabled,
                 log);
         }
 
@@ -36,7 +35,7 @@ namespace ts.projectSystem {
         }
     }
 
-    function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[], typingFiles: FileOrFolder[], cb: TI.RequestCompletedAction): void {
+    function executeCommand(self: Installer, host: TestServerHost, installedTypings: string[] | string, typingFiles: FileOrFolder[], cb: TI.RequestCompletedAction): void {
         self.addPostExecAction(installedTypings, success => {
             for (const file of typingFiles) {
                 host.createFileOrFolder(file, /*createParentDirectory*/ true);
@@ -57,8 +56,8 @@ namespace ts.projectSystem {
                     compilerOptions: {
                         allowJs: true
                     },
-                    typingOptions: {
-                        enableAutoDiscovery: true
+                    typeAcquisition: {
+                        enable: true
                     }
                 })
             };
@@ -145,7 +144,7 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, jquery.path]);
         });
 
-        it("external project - no typing options, no .d.ts/js files", () => {
+        it("external project - no type acquisition, no .d.ts/js files", () => {
             const file1 = {
                 path: "/a/b/app.ts",
                 content: ""
@@ -173,7 +172,7 @@ namespace ts.projectSystem {
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
-        it("external project - no autoDiscovery in typing options, no .d.ts/js files", () => {
+        it("external project - no auto in typing acquisition, no .d.ts/js files", () => {
             const file1 = {
                 path: "/a/b/app.ts",
                 content: ""
@@ -194,11 +193,11 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: {},
                 rootFiles: [toExternalFile(file1.path)],
-                typingOptions: { include: ["jquery"] }
+                typeAcquisition: { include: ["jquery"] }
             });
             installer.checkPendingCommands(/*expectedCount*/ 0);
             // by default auto discovery will kick in if project contain only .js/.d.ts files
-            // in this case project contain only ts files - no auto discovery even if typing options is set
+            // in this case project contain only ts files - no auto discovery even if type acquisition is set
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
@@ -217,9 +216,9 @@ namespace ts.projectSystem {
                 constructor() {
                     super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
+                enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
-                    super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                    super.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings = ["@types/node"];
@@ -234,17 +233,17 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: {},
                 rootFiles: [toExternalFile(file1.path)],
-                typingOptions: { enableAutoDiscovery: true, include: ["jquery"] }
+                typeAcquisition: { enable: true, include: ["jquery"] }
             });
 
             assert.isTrue(enqueueIsCalled, "expected enqueueIsCalled to be true");
             installer.installAll(/*expectedCount*/ 1);
 
-            // autoDiscovery is set in typing options - use it even if project contains only .ts files
+            // auto is set in type acquisition - use it even if project contains only .ts files
             projectService.checkNumberOfProjects({ externalProjects: 1 });
         });
 
-        it("external project - no typing options, with only js, jsx, d.ts files", () => {
+        it("external project - no type acquisition, with only js, jsx, d.ts files", () => {
             // Tests:
             // 1. react typings are installed for .jsx
             // 2. loose files names are matched against safe list for typings if
@@ -288,7 +287,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path), toExternalFile(file3.path)],
-                typingOptions: {}
+                typeAcquisition: {}
             });
 
             const p = projectService.externalProjects[0];
@@ -301,7 +300,7 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, file2.path, file3.path, lodash.path, react.path]);
         });
 
-        it("external project - no typing options, with js & ts files", () => {
+        it("external project - no type acquisition, with js & ts files", () => {
             // Tests:
             // 1. No typings are included for JS projects when the project contains ts files
             const file1 = {
@@ -319,9 +318,9 @@ namespace ts.projectSystem {
                 constructor() {
                     super(host, { typesRegistry: createTypesRegistry("jquery") });
                 }
-                enqueueInstallTypingsRequest(project: server.Project, typingOptions: TypingOptions, unresolvedImports: server.SortedReadonlyArray<string>) {
+                enqueueInstallTypingsRequest(project: server.Project, typeAcquisition: TypeAcquisition, unresolvedImports: server.SortedReadonlyArray<string>) {
                     enqueueIsCalled = true;
-                    super.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                    super.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
                     const installedTypings: string[] = [];
@@ -336,7 +335,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path)],
-                typingOptions: {}
+                typeAcquisition: {}
             });
 
             const p = projectService.externalProjects[0];
@@ -349,11 +348,11 @@ namespace ts.projectSystem {
             checkProjectActualFiles(p, [file1.path, file2.path]);
         });
 
-        it("external project - with typing options, with only js, d.ts files", () => {
+        it("external project - with type acquisition, with only js, d.ts files", () => {
             // Tests:
-            // 1. Safelist matching, typing options includes/excludes and package.json typings are all acquired
-            // 2. Types for safelist matches are not included when they also appear in the typing option exclude list
-            // 3. Multiple includes and excludes are respected in typing options
+            // 1. Safelist matching, type acquisition includes/excludes and package.json typings are all acquired
+            // 2. Types for safelist matches are not included when they also appear in the type acquisition exclude list
+            // 3. Multiple includes and excludes are respected in type acquisition
             const file1 = {
                 path: "/a/b/lodash.js",
                 content: ""
@@ -411,7 +410,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file1.path), toExternalFile(file2.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "moment"], exclude: ["lodash"] }
+                typeAcquisition: { include: ["jquery", "moment"], exclude: ["lodash"] }
             });
 
             const p = projectService.externalProjects[0];
@@ -486,7 +485,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "moment"] }
+                typeAcquisition: { include: ["jquery", "moment"] }
             });
 
             const p = projectService.externalProjects[0];
@@ -572,7 +571,7 @@ namespace ts.projectSystem {
                 projectFileName: projectFileName1,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(lodashJs.path), toExternalFile(commanderJs.path), toExternalFile(file3.path)],
-                typingOptions: { include: ["jquery", "cordova"] }
+                typeAcquisition: { include: ["jquery", "cordova"] }
             });
 
             installer.checkPendingCommands(/*expectedCount*/ 1);
@@ -584,7 +583,7 @@ namespace ts.projectSystem {
                 projectFileName: projectFileName2,
                 options: { allowJS: true, moduleResolution: ModuleResolutionKind.NodeJs },
                 rootFiles: [toExternalFile(file3.path)],
-                typingOptions: { include: ["grunt", "gulp"] }
+                typeAcquisition: { include: ["grunt", "gulp"] }
             });
             assert.equal(installer.pendingRunRequests.length, 1, "expect one throttled request");
 
@@ -907,7 +906,7 @@ namespace ts.projectSystem {
             const host = createServerHost([f1, packageJson]);
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: "/tmp" }, /*telemetryEnabled*/ false, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
+                    super(host, { globalTypingsCacheLocation: "/tmp" }, { isEnabled: () => true, writeLine: msg => messages.push(msg) });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
                     assert(false, "runCommand should not be invoked");
@@ -930,7 +929,7 @@ namespace ts.projectSystem {
             const host = createServerHost([f]);
             const cache = createMap<string>();
             for (const name of JsTyping.nodeCoreModuleList) {
-                const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enableAutoDiscovery: true }, [name, "somename"]);
+                const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enable: true }, [name, "somename"]);
                 assert.deepEqual(result.newTypingNames.sort(), ["node", "somename"]);
             }
         });
@@ -946,7 +945,7 @@ namespace ts.projectSystem {
             };
             const host = createServerHost([f, node]);
             const cache = createMap<string>({ "node": node.path });
-            const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enableAutoDiscovery: true }, ["fs", "bar"]);
+            const result = JsTyping.discoverTypings(host, [f.path], getDirectoryPath(<Path>f.path), /*safeListPath*/ undefined, cache, { enable: true }, ["fs", "bar"]);
             assert.deepEqual(result.cachedTypingPaths, [node.path]);
             assert.deepEqual(result.newTypingNames, ["bar"]);
         });
@@ -971,15 +970,18 @@ namespace ts.projectSystem {
             let seenTelemetryEvent = false;
             const installer = new (class extends Installer {
                 constructor() {
-                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") }, /*telemetryEnabled*/ true);
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
                     const installedTypings = ["@types/commander"];
                     const typingFiles = [commander];
                     executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
-                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.TypingsInstallEvent) {
-                    if (response.kind === server.EventInstall) {
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
                         assert.deepEqual(response.packagesToInstall, ["@types/commander"]);
                         seenTelemetryEvent = true;
                         return;
@@ -997,4 +999,102 @@ namespace ts.projectSystem {
             checkProjectActualFiles(projectService.inferredProjects[0], [f1.path, commander.path]);
         });
     });
+
+    describe("progress notifications", () => {
+        it ("should be sent for success", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: ""
+            };
+            const package = {
+                path: "/a/package.json",
+                content: JSON.stringify({ dependencies: { "commander": "1.0.0" } })
+            };
+            const cachePath = "/a/cache/";
+            const commander = {
+                path: cachePath + "node_modules/@types/commander/index.d.ts",
+                content: "export let x: number"
+            };
+            const host = createServerHost([f1, package]);
+            let beginEvent: server.BeginInstallTypes;
+            let endEvent: server.EndInstallTypes;
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    const installedTypings = ["@types/commander"];
+                    const typingFiles = [commander];
+                    executeCommand(this, host, installedTypings, typingFiles, cb);
+                }
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        beginEvent = response;
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
+                        endEvent = response;
+                        return;
+                    }
+                    super.sendResponse(response);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(f1.path);
+
+            installer.installAll(/*expectedCount*/ 1);
+
+            assert.isTrue(!!beginEvent);
+            assert.isTrue(!!endEvent);
+            assert.isTrue(beginEvent.eventId === endEvent.eventId);
+            assert.isTrue(endEvent.installSuccess);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [f1.path, commander.path]);
+        });
+
+        it ("should be sent for error", () => {
+            const f1 = {
+                path: "/a/app.js",
+                content: ""
+            };
+            const package = {
+                path: "/a/package.json",
+                content: JSON.stringify({ dependencies: { "commander": "1.0.0" } })
+            };
+            const cachePath = "/a/cache/";
+            const host = createServerHost([f1, package]);
+            let beginEvent: server.BeginInstallTypes;
+            let endEvent: server.EndInstallTypes;
+            const installer = new (class extends Installer {
+                constructor() {
+                    super(host, { globalTypingsCacheLocation: cachePath, typesRegistry: createTypesRegistry("commander") });
+                }
+                installWorker(_requestId: number, _args: string[], _cwd: string, cb: server.typingsInstaller.RequestCompletedAction) {
+                    executeCommand(this, host, "", [], cb);
+                }
+                sendResponse(response: server.SetTypings | server.InvalidateCachedTypings | server.BeginInstallTypes | server.EndInstallTypes) {
+                    if (response.kind === server.EventBeginInstallTypes) {
+                        beginEvent = response;
+                        return;
+                    }
+                    if (response.kind === server.EventEndInstallTypes) {
+                        endEvent = response;
+                        return;
+                    }
+                    super.sendResponse(response);
+                }
+            })();
+            const projectService = createProjectService(host, { typingsInstaller: installer });
+            projectService.openClientFile(f1.path);
+
+            installer.installAll(/*expectedCount*/ 1);
+
+            assert.isTrue(!!beginEvent);
+            assert.isTrue(!!endEvent);
+            assert.isTrue(beginEvent.eventId === endEvent.eventId);
+            assert.isFalse(endEvent.installSuccess);
+            checkNumberOfProjects(projectService, { inferredProjects: 1 });
+            checkProjectActualFiles(projectService.inferredProjects[0], [f1.path]);
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/lib/dom.generated.d.ts b/src/lib/dom.generated.d.ts
index fd77f369fd8..d9825897ebc 100644
--- a/src/lib/dom.generated.d.ts
+++ b/src/lib/dom.generated.d.ts
@@ -76,6 +76,7 @@ interface DoubleRange {
 }
 
 interface EventInit {
+    scoped?: boolean;
     bubbles?: boolean;
     cancelable?: boolean;
 }
@@ -917,15 +918,26 @@ declare var AnimationEvent: {
     new(): AnimationEvent;
 }
 
+interface ApplicationCacheEventMap {
+    "cached": Event;
+    "checking": Event;
+    "downloading": Event;
+    "error": ErrorEvent;
+    "noupdate": Event;
+    "obsolete": Event;
+    "progress": ProgressEvent;
+    "updateready": Event;
+}
+
 interface ApplicationCache extends EventTarget {
-    oncached: (this: this, ev: Event) => any;
-    onchecking: (this: this, ev: Event) => any;
-    ondownloading: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onnoupdate: (this: this, ev: Event) => any;
-    onobsolete: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onupdateready: (this: this, ev: Event) => any;
+    oncached: (this: ApplicationCache, ev: Event) => any;
+    onchecking: (this: ApplicationCache, ev: Event) => any;
+    ondownloading: (this: ApplicationCache, ev: Event) => any;
+    onerror: (this: ApplicationCache, ev: ErrorEvent) => any;
+    onnoupdate: (this: ApplicationCache, ev: Event) => any;
+    onobsolete: (this: ApplicationCache, ev: Event) => any;
+    onprogress: (this: ApplicationCache, ev: ProgressEvent) => any;
+    onupdateready: (this: ApplicationCache, ev: Event) => any;
     readonly status: number;
     abort(): void;
     swapCache(): void;
@@ -936,14 +948,7 @@ interface ApplicationCache extends EventTarget {
     readonly OBSOLETE: number;
     readonly UNCACHED: number;
     readonly UPDATEREADY: number;
-    addEventListener(type: "cached", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "checking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "downloading", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "noupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "obsolete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "updateready", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof ApplicationCacheEventMap>(type: K, listener: (this: ApplicationCache, ev: ApplicationCacheEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -996,17 +1001,21 @@ declare var AudioBuffer: {
     new(): AudioBuffer;
 }
 
+interface AudioBufferSourceNodeEventMap {
+    "ended": MediaStreamErrorEvent;
+}
+
 interface AudioBufferSourceNode extends AudioNode {
     buffer: AudioBuffer | null;
     readonly detune: AudioParam;
     loop: boolean;
     loopEnd: number;
     loopStart: number;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: AudioBufferSourceNode, ev: MediaStreamErrorEvent) => any;
     readonly playbackRate: AudioParam;
     start(when?: number, offset?: number, duration?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof AudioBufferSourceNodeEventMap>(type: K, listener: (this: AudioBufferSourceNode, ev: AudioBufferSourceNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -1128,16 +1137,20 @@ declare var AudioTrack: {
     new(): AudioTrack;
 }
 
+interface AudioTrackListEventMap {
+    "addtrack": TrackEvent;
+    "change": Event;
+    "removetrack": TrackEvent;
+}
+
 interface AudioTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    onchange: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onaddtrack: (this: AudioTrackList, ev: TrackEvent) => any;
+    onchange: (this: AudioTrackList, ev: Event) => any;
+    onremovetrack: (this: AudioTrackList, ev: TrackEvent) => any;
     getTrackById(id: string): AudioTrack | null;
     item(index: number): AudioTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof AudioTrackListEventMap>(type: K, listener: (this: AudioTrackList, ev: AudioTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: AudioTrack;
 }
@@ -1838,7 +1851,6 @@ interface CharacterData extends Node, ChildNode {
     insertData(offset: number, arg: string): void;
     replaceData(offset: number, count: number, arg: string): void;
     substringData(offset: number, count: number): string;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var CharacterData: {
@@ -2163,6 +2175,8 @@ declare var DOMTokenList: {
 
 interface DataCue extends TextTrackCue {
     data: ArrayBuffer;
+    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DataCue: {
@@ -2291,7 +2305,98 @@ declare var DeviceRotationRate: {
     new(): DeviceRotationRate;
 }
 
-interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent, ParentNode {
+interface DocumentEventMap extends GlobalEventHandlersEventMap {
+    "abort": UIEvent;
+    "activate": UIEvent;
+    "beforeactivate": UIEvent;
+    "beforedeactivate": UIEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "contextmenu": PointerEvent;
+    "dblclick": MouseEvent;
+    "deactivate": UIEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "fullscreenchange": Event;
+    "fullscreenerror": Event;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "mousedown": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSContentZoom": UIEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSManipulationStateChanged": MSManipulationEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "mssitemodejumplistitemremoved": MSSiteModeEvent;
+    "msthumbnailclick": MSSiteModeEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "pointerlockchange": Event;
+    "pointerlockerror": Event;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "readystatechange": ProgressEvent;
+    "reset": Event;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "selectionchange": Event;
+    "selectstart": Event;
+    "stalled": Event;
+    "stop": Event;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "touchcancel": TouchEvent;
+    "touchend": TouchEvent;
+    "touchmove": TouchEvent;
+    "touchstart": TouchEvent;
+    "volumechange": Event;
+    "waiting": Event;
+    "webkitfullscreenchange": Event;
+    "webkitfullscreenerror": Event;
+}
+
+interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEvent, ParentNode, DocumentOrShadowRoot {
     /**
       * Sets or gets the URL for the current document. 
       */
@@ -2414,294 +2519,294 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Fires when the user aborts the download.
       * @param ev The event.
       */
-    onabort: (this: this, ev: UIEvent) => any;
+    onabort: (this: Document, ev: UIEvent) => any;
     /**
       * Fires when the object is set as the active element.
       * @param ev The event.
       */
-    onactivate: (this: this, ev: UIEvent) => any;
+    onactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires immediately before the object is set as the active element.
       * @param ev The event.
       */
-    onbeforeactivate: (this: this, ev: UIEvent) => any;
+    onbeforeactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires immediately before the activeElement is changed from the current object to another object in the parent document.
       * @param ev The event.
       */
-    onbeforedeactivate: (this: this, ev: UIEvent) => any;
+    onbeforedeactivate: (this: Document, ev: UIEvent) => any;
     /** 
       * Fires when the object loses the input focus. 
       * @param ev The focus event.
       */
-    onblur: (this: this, ev: FocusEvent) => any;
+    onblur: (this: Document, ev: FocusEvent) => any;
     /**
       * Occurs when playback is possible, but would require further buffering. 
       * @param ev The event.
       */
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
+    oncanplay: (this: Document, ev: Event) => any;
+    oncanplaythrough: (this: Document, ev: Event) => any;
     /**
       * Fires when the contents of the object or selection have changed. 
       * @param ev The event.
       */
-    onchange: (this: this, ev: Event) => any;
+    onchange: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the left mouse button on the object
       * @param ev The mouse event.
       */
-    onclick: (this: this, ev: MouseEvent) => any;
+    onclick: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user clicks the right mouse button in the client area, opening the context menu. 
       * @param ev The mouse event.
       */
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
+    oncontextmenu: (this: Document, ev: PointerEvent) => any;
     /**
       * Fires when the user double-clicks the object.
       * @param ev The mouse event.
       */
-    ondblclick: (this: this, ev: MouseEvent) => any;
+    ondblclick: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the activeElement is changed from the current object to another object in the parent document.
       * @param ev The UI Event
       */
-    ondeactivate: (this: this, ev: UIEvent) => any;
+    ondeactivate: (this: Document, ev: UIEvent) => any;
     /**
       * Fires on the source object continuously during a drag operation.
       * @param ev The event.
       */
-    ondrag: (this: this, ev: DragEvent) => any;
+    ondrag: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the source object when the user releases the mouse at the close of a drag operation.
       * @param ev The event.
       */
-    ondragend: (this: this, ev: DragEvent) => any;
+    ondragend: (this: Document, ev: DragEvent) => any;
     /** 
       * Fires on the target element when the user drags the object to a valid drop target.
       * @param ev The drag event.
       */
-    ondragenter: (this: this, ev: DragEvent) => any;
+    ondragenter: (this: Document, ev: DragEvent) => any;
     /** 
       * Fires on the target object when the user moves the mouse out of a valid drop target during a drag operation.
       * @param ev The drag event.
       */
-    ondragleave: (this: this, ev: DragEvent) => any;
+    ondragleave: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the target element continuously while the user drags the object over a valid drop target.
       * @param ev The event.
       */
-    ondragover: (this: this, ev: DragEvent) => any;
+    ondragover: (this: Document, ev: DragEvent) => any;
     /**
       * Fires on the source object when the user starts to drag a text selection or selected object. 
       * @param ev The event.
       */
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
+    ondragstart: (this: Document, ev: DragEvent) => any;
+    ondrop: (this: Document, ev: DragEvent) => any;
     /**
       * Occurs when the duration attribute is updated. 
       * @param ev The event.
       */
-    ondurationchange: (this: this, ev: Event) => any;
+    ondurationchange: (this: Document, ev: Event) => any;
     /**
       * Occurs when the media element is reset to its initial state. 
       * @param ev The event.
       */
-    onemptied: (this: this, ev: Event) => any;
+    onemptied: (this: Document, ev: Event) => any;
     /**
       * Occurs when the end of playback is reached. 
       * @param ev The event
       */
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: Document, ev: MediaStreamErrorEvent) => any;
     /**
       * Fires when an error occurs during object loading.
       * @param ev The event.
       */
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onerror: (this: Document, ev: ErrorEvent) => any;
     /**
       * Fires when the object receives focus. 
       * @param ev The event.
       */
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onfullscreenchange: (this: this, ev: Event) => any;
-    onfullscreenerror: (this: this, ev: Event) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
+    onfocus: (this: Document, ev: FocusEvent) => any;
+    onfullscreenchange: (this: Document, ev: Event) => any;
+    onfullscreenerror: (this: Document, ev: Event) => any;
+    oninput: (this: Document, ev: Event) => any;
+    oninvalid: (this: Document, ev: Event) => any;
     /**
       * Fires when the user presses a key.
       * @param ev The keyboard event
       */
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
+    onkeydown: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires when the user presses an alphanumeric key.
       * @param ev The event.
       */
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
+    onkeypress: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires when the user releases a key.
       * @param ev The keyboard event
       */
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
+    onkeyup: (this: Document, ev: KeyboardEvent) => any;
     /**
       * Fires immediately after the browser loads the object. 
       * @param ev The event.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: Document, ev: Event) => any;
     /**
       * Occurs when media data is loaded at the current playback position. 
       * @param ev The event.
       */
-    onloadeddata: (this: this, ev: Event) => any;
+    onloadeddata: (this: Document, ev: Event) => any;
     /**
       * Occurs when the duration and dimensions of the media have been determined.
       * @param ev The event.
       */
-    onloadedmetadata: (this: this, ev: Event) => any;
+    onloadedmetadata: (this: Document, ev: Event) => any;
     /**
       * Occurs when Internet Explorer begins looking for media data. 
       * @param ev The event.
       */
-    onloadstart: (this: this, ev: Event) => any;
+    onloadstart: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the object with either mouse button. 
       * @param ev The mouse event.
       */
-    onmousedown: (this: this, ev: MouseEvent) => any;
+    onmousedown: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse over the object. 
       * @param ev The mouse event.
       */
-    onmousemove: (this: this, ev: MouseEvent) => any;
+    onmousemove: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse pointer outside the boundaries of the object. 
       * @param ev The mouse event.
       */
-    onmouseout: (this: this, ev: MouseEvent) => any;
+    onmouseout: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user moves the mouse pointer into the object.
       * @param ev The mouse event.
       */
-    onmouseover: (this: this, ev: MouseEvent) => any;
+    onmouseover: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the user releases a mouse button while the mouse is over the object. 
       * @param ev The mouse event.
       */
-    onmouseup: (this: this, ev: MouseEvent) => any;
+    onmouseup: (this: Document, ev: MouseEvent) => any;
     /**
       * Fires when the wheel button is rotated. 
       * @param ev The mouse event
       */
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmscontentzoom: (this: this, ev: UIEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmsmanipulationstatechanged: (this: this, ev: MSManipulationEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
+    onmousewheel: (this: Document, ev: WheelEvent) => any;
+    onmscontentzoom: (this: Document, ev: UIEvent) => any;
+    onmsgesturechange: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Document, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Document, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Document, ev: MSGestureEvent) => any;
+    onmsinertiastart: (this: Document, ev: MSGestureEvent) => any;
+    onmsmanipulationstatechanged: (this: Document, ev: MSManipulationEvent) => any;
+    onmspointercancel: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Document, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Document, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Document, ev: MSPointerEvent) => any;
     /**
       * Occurs when an item is removed from a Jump List of a webpage running in Site Mode. 
       * @param ev The event.
       */
-    onmssitemodejumplistitemremoved: (this: this, ev: MSSiteModeEvent) => any;
+    onmssitemodejumplistitemremoved: (this: Document, ev: MSSiteModeEvent) => any;
     /**
       * Occurs when a user clicks a button in a Thumbnail Toolbar of a webpage running in Site Mode.
       * @param ev The event.
       */
-    onmsthumbnailclick: (this: this, ev: MSSiteModeEvent) => any;
+    onmsthumbnailclick: (this: Document, ev: MSSiteModeEvent) => any;
     /**
       * Occurs when playback is paused.
       * @param ev The event.
       */
-    onpause: (this: this, ev: Event) => any;
+    onpause: (this: Document, ev: Event) => any;
     /**
       * Occurs when the play method is requested. 
       * @param ev The event.
       */
-    onplay: (this: this, ev: Event) => any;
+    onplay: (this: Document, ev: Event) => any;
     /**
       * Occurs when the audio or video has started playing. 
       * @param ev The event.
       */
-    onplaying: (this: this, ev: Event) => any;
-    onpointerlockchange: (this: this, ev: Event) => any;
-    onpointerlockerror: (this: this, ev: Event) => any;
+    onplaying: (this: Document, ev: Event) => any;
+    onpointerlockchange: (this: Document, ev: Event) => any;
+    onpointerlockerror: (this: Document, ev: Event) => any;
     /**
       * Occurs to indicate progress while downloading media data. 
       * @param ev The event.
       */
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onprogress: (this: Document, ev: ProgressEvent) => any;
     /**
       * Occurs when the playback rate is increased or decreased. 
       * @param ev The event.
       */
-    onratechange: (this: this, ev: Event) => any;
+    onratechange: (this: Document, ev: Event) => any;
     /**
       * Fires when the state of the object has changed.
       * @param ev The event
       */
-    onreadystatechange: (this: this, ev: ProgressEvent) => any;
+    onreadystatechange: (this: Document, ev: ProgressEvent) => any;
     /**
       * Fires when the user resets a form. 
       * @param ev The event.
       */
-    onreset: (this: this, ev: Event) => any;
+    onreset: (this: Document, ev: Event) => any;
     /**
       * Fires when the user repositions the scroll box in the scroll bar on the object. 
       * @param ev The event.
       */
-    onscroll: (this: this, ev: UIEvent) => any;
+    onscroll: (this: Document, ev: UIEvent) => any;
     /**
       * Occurs when the seek operation ends. 
       * @param ev The event.
       */
-    onseeked: (this: this, ev: Event) => any;
+    onseeked: (this: Document, ev: Event) => any;
     /**
       * Occurs when the current playback position is moved. 
       * @param ev The event.
       */
-    onseeking: (this: this, ev: Event) => any;
+    onseeking: (this: Document, ev: Event) => any;
     /**
       * Fires when the current selection changes.
       * @param ev The event.
       */
-    onselect: (this: this, ev: UIEvent) => any;
+    onselect: (this: Document, ev: UIEvent) => any;
     /**
       * Fires when the selection state of a document changes.
       * @param ev The event.
       */
-    onselectionchange: (this: this, ev: Event) => any;
-    onselectstart: (this: this, ev: Event) => any;
+    onselectionchange: (this: Document, ev: Event) => any;
+    onselectstart: (this: Document, ev: Event) => any;
     /**
       * Occurs when the download has stopped. 
       * @param ev The event.
       */
-    onstalled: (this: this, ev: Event) => any;
+    onstalled: (this: Document, ev: Event) => any;
     /**
       * Fires when the user clicks the Stop button or leaves the Web page.
       * @param ev The event.
       */
-    onstop: (this: this, ev: Event) => any;
-    onsubmit: (this: this, ev: Event) => any;
+    onstop: (this: Document, ev: Event) => any;
+    onsubmit: (this: Document, ev: Event) => any;
     /**
       * Occurs if the load operation has been intentionally halted. 
       * @param ev The event.
       */
-    onsuspend: (this: this, ev: Event) => any;
+    onsuspend: (this: Document, ev: Event) => any;
     /**
       * Occurs to indicate the current playback position.
       * @param ev The event.
       */
-    ontimeupdate: (this: this, ev: Event) => any;
+    ontimeupdate: (this: Document, ev: Event) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
@@ -2710,14 +2815,14 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Occurs when the volume is changed, or playback is muted or unmuted.
       * @param ev The event.
       */
-    onvolumechange: (this: this, ev: Event) => any;
+    onvolumechange: (this: Document, ev: Event) => any;
     /**
       * Occurs when playback stops because the next frame of a video resource is not available. 
       * @param ev The event.
       */
-    onwaiting: (this: this, ev: Event) => any;
-    onwebkitfullscreenchange: (this: this, ev: Event) => any;
-    onwebkitfullscreenerror: (this: this, ev: Event) => any;
+    onwaiting: (this: Document, ev: Event) => any;
+    onwebkitfullscreenchange: (this: Document, ev: Event) => any;
+    onwebkitfullscreenerror: (this: Document, ev: Event) => any;
     plugins: HTMLCollectionOf<HTMLEmbedElement>;
     readonly pointerLockElement: Element;
     /**
@@ -2788,86 +2893,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Creates an instance of the element for the specified tag.
       * @param tagName The name of an element.
       */
-    createElement(tagName: "a"): HTMLAnchorElement;
-    createElement(tagName: "applet"): HTMLAppletElement;
-    createElement(tagName: "area"): HTMLAreaElement;
-    createElement(tagName: "audio"): HTMLAudioElement;
-    createElement(tagName: "base"): HTMLBaseElement;
-    createElement(tagName: "basefont"): HTMLBaseFontElement;
-    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: "col"): HTMLTableColElement;
-    createElement(tagName: "colgroup"): HTMLTableColElement;
-    createElement(tagName: "datalist"): HTMLDataListElement;
-    createElement(tagName: "del"): HTMLModElement;
-    createElement(tagName: "dir"): HTMLDirectoryElement;
-    createElement(tagName: "div"): HTMLDivElement;
-    createElement(tagName: "dl"): HTMLDListElement;
-    createElement(tagName: "embed"): HTMLEmbedElement;
-    createElement(tagName: "fieldset"): HTMLFieldSetElement;
-    createElement(tagName: "font"): HTMLFontElement;
-    createElement(tagName: "form"): HTMLFormElement;
-    createElement(tagName: "frame"): HTMLFrameElement;
-    createElement(tagName: "frameset"): HTMLFrameSetElement;
-    createElement(tagName: "h1"): HTMLHeadingElement;
-    createElement(tagName: "h2"): HTMLHeadingElement;
-    createElement(tagName: "h3"): HTMLHeadingElement;
-    createElement(tagName: "h4"): HTMLHeadingElement;
-    createElement(tagName: "h5"): HTMLHeadingElement;
-    createElement(tagName: "h6"): HTMLHeadingElement;
-    createElement(tagName: "head"): HTMLHeadElement;
-    createElement(tagName: "hr"): HTMLHRElement;
-    createElement(tagName: "html"): HTMLHtmlElement;
-    createElement(tagName: "iframe"): HTMLIFrameElement;
-    createElement(tagName: "img"): HTMLImageElement;
-    createElement(tagName: "input"): HTMLInputElement;
-    createElement(tagName: "ins"): HTMLModElement;
-    createElement(tagName: "isindex"): HTMLUnknownElement;
-    createElement(tagName: "label"): HTMLLabelElement;
-    createElement(tagName: "legend"): HTMLLegendElement;
-    createElement(tagName: "li"): HTMLLIElement;
-    createElement(tagName: "link"): HTMLLinkElement;
-    createElement(tagName: "listing"): HTMLPreElement;
-    createElement(tagName: "map"): HTMLMapElement;
-    createElement(tagName: "marquee"): HTMLMarqueeElement;
-    createElement(tagName: "menu"): HTMLMenuElement;
-    createElement(tagName: "meta"): HTMLMetaElement;
-    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: "picture"): HTMLPictureElement;
-    createElement(tagName: "pre"): HTMLPreElement;
-    createElement(tagName: "progress"): HTMLProgressElement;
-    createElement(tagName: "q"): HTMLQuoteElement;
-    createElement(tagName: "script"): HTMLScriptElement;
-    createElement(tagName: "select"): HTMLSelectElement;
-    createElement(tagName: "source"): HTMLSourceElement;
-    createElement(tagName: "span"): HTMLSpanElement;
-    createElement(tagName: "style"): HTMLStyleElement;
-    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;
-    createElement(tagName: "thead"): HTMLTableSectionElement;
-    createElement(tagName: "title"): HTMLTitleElement;
-    createElement(tagName: "tr"): HTMLTableRowElement;
-    createElement(tagName: "track"): HTMLTrackElement;
-    createElement(tagName: "ul"): HTMLUListElement;
-    createElement(tagName: "video"): HTMLVideoElement;
-    createElement(tagName: "x-ms-webview"): MSHTMLWebViewElement;
-    createElement(tagName: "xmp"): HTMLPreElement;
+    createElement<K extends keyof HTMLElementTagNameMap>(tagName: K): HTMLElementTagNameMap[K];
     createElement(tagName: string): HTMLElement;
     createElementNS(namespaceURI: "http://www.w3.org/1999/xhtml", qualifiedName: string): HTMLElement
     createElementNS(namespaceURI: "http://www.w3.org/2000/svg", qualifiedName: "a"): SVGAElement
@@ -2969,7 +2995,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param y The y-offset
       */
     elementFromPoint(x: number, y: number): Element;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
+    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
     /**
       * Executes a command on the current document, current selection, or the given range.
       * @param commandId String that specifies the command to execute. This command can be any of the command identifiers that can be executed in script.
@@ -3003,182 +3029,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * Retrieves a collection of objects based on the specified element name.
       * @param name Specifies the name of an element.
       */
-    getElementsByTagName(tagname: "a"): NodeListOf<HTMLAnchorElement>;
-    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<HTMLElement>;
-    getElementsByTagName(tagname: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(tagname: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    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<HTMLElement>;
-    getElementsByTagName(tagname: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(tagname: "cite"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(tagname: "code"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(tagname: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(tagname: "dd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(tagname: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(tagname: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(tagname: "dfn"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(tagname: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(tagname: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(tagname: "dt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(tagname: "em"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(tagname: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(tagname: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(tagname: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(tagname: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(tagname: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(tagname: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(tagname: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(tagname: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(tagname: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(tagname: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(tagname: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(tagname: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(tagname: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(tagname: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(tagname: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(tagname: "html"): NodeListOf<HTMLHtmlElement>;
-    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<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<HTMLPreElement>;
-    getElementsByTagName(tagname: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(tagname: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(tagname: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(tagname: "mask"): NodeListOf<SVGMaskElement>;
-    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<HTMLUnknownElement>;
-    getElementsByTagName(tagname: "nobr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(tagname: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(tagname: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(tagname: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(tagname: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(tagname: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(tagname: "pattern"): NodeListOf<SVGPatternElement>;
-    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>;
-    getElementsByTagName(tagname: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(tagname: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(tagname: "rect"): NodeListOf<SVGRectElement>;
-    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<HTMLElement>;
-    getElementsByTagName(tagname: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(tagname: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(tagname: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(tagname: "strike"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "strong"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "style"): NodeListOf<HTMLStyleElement>;
-    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>;
-    getElementsByTagName(tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(tagname: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(tagname: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(tagname: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(tagname: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(tagname: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(tagname: "tt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "u"): NodeListOf<HTMLElement>;
-    getElementsByTagName(tagname: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(tagname: "use"): NodeListOf<SVGUseElement>;
-    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<HTMLPreElement>;
+    getElementsByTagName<K extends keyof ElementListTagNameMap>(tagname: K): ElementListTagNameMap[K];
     getElementsByTagName(tagname: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
@@ -3249,103 +3100,7 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
       * @param content The text and HTML tags to write.
       */
     writeln(...content: string[]): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "fullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mssitemodejumplistitemremoved", listener: (this: this, ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msthumbnailclick", listener: (this: this, ev: MSSiteModeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerlockerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectionchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stop", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3355,7 +3110,6 @@ declare var Document: {
 }
 
 interface DocumentFragment extends Node, NodeSelector, ParentNode {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DocumentFragment: {
@@ -3370,7 +3124,6 @@ interface DocumentType extends Node, ChildNode {
     readonly notations: NamedNodeMap;
     readonly publicId: string | null;
     readonly systemId: string | null;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var DocumentType: {
@@ -3423,6 +3176,36 @@ declare var EXT_texture_filter_anisotropic: {
     readonly TEXTURE_MAX_ANISOTROPY_EXT: number;
 }
 
+interface ElementEventMap extends GlobalEventHandlersEventMap {
+    "ariarequest": AriaRequestEvent;
+    "command": CommandEvent;
+    "gotpointercapture": PointerEvent;
+    "lostpointercapture": PointerEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSGotPointerCapture": MSPointerEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSLostPointerCapture": MSPointerEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "touchcancel": TouchEvent;
+    "touchend": TouchEvent;
+    "touchmove": TouchEvent;
+    "touchstart": TouchEvent;
+    "webkitfullscreenchange": Event;
+    "webkitfullscreenerror": Event;
+}
+
 interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelector, ChildNode, ParentNode {
     readonly classList: DOMTokenList;
     className: string;
@@ -3433,33 +3216,33 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     id: string;
     msContentZoomFactor: number;
     readonly msRegionOverflow: string;
-    onariarequest: (this: this, ev: AriaRequestEvent) => any;
-    oncommand: (this: this, ev: CommandEvent) => any;
-    ongotpointercapture: (this: this, ev: PointerEvent) => any;
-    onlostpointercapture: (this: this, ev: PointerEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsgotpointercapture: (this: this, ev: MSPointerEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmslostpointercapture: (this: this, ev: MSPointerEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
+    onariarequest: (this: Element, ev: AriaRequestEvent) => any;
+    oncommand: (this: Element, ev: CommandEvent) => any;
+    ongotpointercapture: (this: Element, ev: PointerEvent) => any;
+    onlostpointercapture: (this: Element, ev: PointerEvent) => any;
+    onmsgesturechange: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Element, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Element, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Element, ev: MSGestureEvent) => any;
+    onmsgotpointercapture: (this: Element, ev: MSPointerEvent) => any;
+    onmsinertiastart: (this: Element, ev: MSGestureEvent) => any;
+    onmslostpointercapture: (this: Element, ev: MSPointerEvent) => any;
+    onmspointercancel: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Element, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Element, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Element, ev: MSPointerEvent) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onwebkitfullscreenchange: (this: this, ev: Event) => any;
-    onwebkitfullscreenerror: (this: this, ev: Event) => any;
+    onwebkitfullscreenchange: (this: Element, ev: Event) => any;
+    onwebkitfullscreenerror: (this: Element, ev: Event) => any;
     readonly prefix: string | null;
     readonly scrollHeight: number;
     scrollLeft: number;
@@ -3467,188 +3250,16 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     readonly scrollWidth: number;
     readonly tagName: string;
     innerHTML: string;
+    readonly assignedSlot: HTMLSlotElement | null;
+    slot: string;
+    readonly shadowRoot: ShadowRoot | null;
     getAttribute(name: string): string | null;
     getAttributeNS(namespaceURI: string, localName: string): string;
     getAttributeNode(name: string): Attr;
     getAttributeNodeNS(namespaceURI: string, localName: string): Attr;
     getBoundingClientRect(): ClientRect;
     getClientRects(): ClientRectList;
-    getElementsByTagName(name: "a"): NodeListOf<HTMLAnchorElement>;
-    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<HTMLElement>;
-    getElementsByTagName(name: "base"): NodeListOf<HTMLBaseElement>;
-    getElementsByTagName(name: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    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<HTMLElement>;
-    getElementsByTagName(name: "circle"): NodeListOf<SVGCircleElement>;
-    getElementsByTagName(name: "cite"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "clippath"): NodeListOf<SVGClipPathElement>;
-    getElementsByTagName(name: "code"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "col"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "colgroup"): NodeListOf<HTMLTableColElement>;
-    getElementsByTagName(name: "datalist"): NodeListOf<HTMLDataListElement>;
-    getElementsByTagName(name: "dd"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "defs"): NodeListOf<SVGDefsElement>;
-    getElementsByTagName(name: "del"): NodeListOf<HTMLModElement>;
-    getElementsByTagName(name: "desc"): NodeListOf<SVGDescElement>;
-    getElementsByTagName(name: "dfn"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "dir"): NodeListOf<HTMLDirectoryElement>;
-    getElementsByTagName(name: "div"): NodeListOf<HTMLDivElement>;
-    getElementsByTagName(name: "dl"): NodeListOf<HTMLDListElement>;
-    getElementsByTagName(name: "dt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "ellipse"): NodeListOf<SVGEllipseElement>;
-    getElementsByTagName(name: "em"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "embed"): NodeListOf<HTMLEmbedElement>;
-    getElementsByTagName(name: "feblend"): NodeListOf<SVGFEBlendElement>;
-    getElementsByTagName(name: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    getElementsByTagName(name: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    getElementsByTagName(name: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    getElementsByTagName(name: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    getElementsByTagName(name: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    getElementsByTagName(name: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    getElementsByTagName(name: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    getElementsByTagName(name: "feflood"): NodeListOf<SVGFEFloodElement>;
-    getElementsByTagName(name: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    getElementsByTagName(name: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    getElementsByTagName(name: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    getElementsByTagName(name: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    getElementsByTagName(name: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    getElementsByTagName(name: "feimage"): NodeListOf<SVGFEImageElement>;
-    getElementsByTagName(name: "femerge"): NodeListOf<SVGFEMergeElement>;
-    getElementsByTagName(name: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    getElementsByTagName(name: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    getElementsByTagName(name: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    getElementsByTagName(name: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    getElementsByTagName(name: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    getElementsByTagName(name: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    getElementsByTagName(name: "fetile"): NodeListOf<SVGFETileElement>;
-    getElementsByTagName(name: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    getElementsByTagName(name: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    getElementsByTagName(name: "figcaption"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "figure"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "filter"): NodeListOf<SVGFilterElement>;
-    getElementsByTagName(name: "font"): NodeListOf<HTMLFontElement>;
-    getElementsByTagName(name: "footer"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    getElementsByTagName(name: "form"): NodeListOf<HTMLFormElement>;
-    getElementsByTagName(name: "frame"): NodeListOf<HTMLFrameElement>;
-    getElementsByTagName(name: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    getElementsByTagName(name: "g"): NodeListOf<SVGGElement>;
-    getElementsByTagName(name: "h1"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h2"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h3"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h4"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h5"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "h6"): NodeListOf<HTMLHeadingElement>;
-    getElementsByTagName(name: "head"): NodeListOf<HTMLHeadElement>;
-    getElementsByTagName(name: "header"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hgroup"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "hr"): NodeListOf<HTMLHRElement>;
-    getElementsByTagName(name: "html"): NodeListOf<HTMLHtmlElement>;
-    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<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<HTMLPreElement>;
-    getElementsByTagName(name: "map"): NodeListOf<HTMLMapElement>;
-    getElementsByTagName(name: "mark"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "marker"): NodeListOf<SVGMarkerElement>;
-    getElementsByTagName(name: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    getElementsByTagName(name: "mask"): NodeListOf<SVGMaskElement>;
-    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<HTMLUnknownElement>;
-    getElementsByTagName(name: "nobr"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "noframes"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "noscript"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "object"): NodeListOf<HTMLObjectElement>;
-    getElementsByTagName(name: "ol"): NodeListOf<HTMLOListElement>;
-    getElementsByTagName(name: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    getElementsByTagName(name: "option"): NodeListOf<HTMLOptionElement>;
-    getElementsByTagName(name: "p"): NodeListOf<HTMLParagraphElement>;
-    getElementsByTagName(name: "param"): NodeListOf<HTMLParamElement>;
-    getElementsByTagName(name: "path"): NodeListOf<SVGPathElement>;
-    getElementsByTagName(name: "pattern"): NodeListOf<SVGPatternElement>;
-    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>;
-    getElementsByTagName(name: "progress"): NodeListOf<HTMLProgressElement>;
-    getElementsByTagName(name: "q"): NodeListOf<HTMLQuoteElement>;
-    getElementsByTagName(name: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    getElementsByTagName(name: "rect"): NodeListOf<SVGRectElement>;
-    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<HTMLElement>;
-    getElementsByTagName(name: "source"): NodeListOf<HTMLSourceElement>;
-    getElementsByTagName(name: "span"): NodeListOf<HTMLSpanElement>;
-    getElementsByTagName(name: "stop"): NodeListOf<SVGStopElement>;
-    getElementsByTagName(name: "strike"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "strong"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "style"): NodeListOf<HTMLStyleElement>;
-    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>;
-    getElementsByTagName(name: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    getElementsByTagName(name: "thead"): NodeListOf<HTMLTableSectionElement>;
-    getElementsByTagName(name: "title"): NodeListOf<HTMLTitleElement>;
-    getElementsByTagName(name: "tr"): NodeListOf<HTMLTableRowElement>;
-    getElementsByTagName(name: "track"): NodeListOf<HTMLTrackElement>;
-    getElementsByTagName(name: "tspan"): NodeListOf<SVGTSpanElement>;
-    getElementsByTagName(name: "tt"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "u"): NodeListOf<HTMLElement>;
-    getElementsByTagName(name: "ul"): NodeListOf<HTMLUListElement>;
-    getElementsByTagName(name: "use"): NodeListOf<SVGUseElement>;
-    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<HTMLPreElement>;
+    getElementsByTagName<K extends keyof ElementListTagNameMap>(name: K): ElementListTagNameMap[K];
     getElementsByTagName(name: string): NodeListOf<Element>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
     getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
@@ -3688,42 +3299,8 @@ interface Element extends Node, GlobalEventHandlers, ElementTraversal, NodeSelec
     insertAdjacentElement(position: string, insertedElement: Element): Element | null;
     insertAdjacentHTML(where: string, html: string): void;
     insertAdjacentText(where: string, text: string): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    attachShadow(shadowRootInitDict: ShadowRootInit): ShadowRoot;
+    addEventListener<K extends keyof ElementEventMap>(type: K, listener: (this: Element, ev: ElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3759,10 +3336,12 @@ interface Event {
     readonly target: EventTarget;
     readonly timeStamp: number;
     readonly type: string;
+    readonly scoped: boolean;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
+    deepPath(): EventTarget[];
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -3823,6 +3402,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -3993,6 +3573,8 @@ interface HTMLAnchorElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAnchorElement: {
@@ -4065,6 +3647,8 @@ interface HTMLAppletElement extends HTMLElement {
     useMap: string;
     vspace: number;
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAppletElement: {
@@ -4131,6 +3715,8 @@ interface HTMLAreaElement extends HTMLElement {
       * Returns a string representation of an object.
       */
     toString(): string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAreaElement: {
@@ -4155,6 +3741,8 @@ declare var HTMLAreasCollection: {
 }
 
 interface HTMLAudioElement extends HTMLMediaElement {
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLAudioElement: {
@@ -4167,6 +3755,8 @@ interface HTMLBRElement extends HTMLElement {
       * Sets or retrieves the side on which floating objects are not to be positioned when any IHTMLBlockElement is inserted into the document.
       */
     clear: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLBRElement: {
@@ -4183,6 +3773,8 @@ interface HTMLBaseElement extends HTMLElement {
       * Sets or retrieves the window or frame at which to target content.
       */
     target: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLBaseElement: {
@@ -4199,6 +3791,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty
       * Sets or retrieves the font size of the object.
       */
     size: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4207,6 +3800,27 @@ declare var HTMLBaseFontElement: {
     new(): HTMLBaseFontElement;
 }
 
+interface HTMLBodyElementEventMap extends HTMLElementEventMap {
+    "afterprint": Event;
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "load": Event;
+    "message": MessageEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "popstate": PopStateEvent;
+    "resize": UIEvent;
+    "storage": StorageEvent;
+    "unload": Event;
+}
+
 interface HTMLBodyElement extends HTMLElement {
     aLink: any;
     background: string;
@@ -4214,147 +3828,27 @@ interface HTMLBodyElement extends HTMLElement {
     bgProperties: string;
     link: any;
     noWrap: boolean;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onpopstate: (this: this, ev: PopStateEvent) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onunload: (this: this, ev: Event) => any;
+    onafterprint: (this: HTMLBodyElement, ev: Event) => any;
+    onbeforeprint: (this: HTMLBodyElement, ev: Event) => any;
+    onbeforeunload: (this: HTMLBodyElement, ev: BeforeUnloadEvent) => any;
+    onblur: (this: HTMLBodyElement, ev: FocusEvent) => any;
+    onerror: (this: HTMLBodyElement, ev: ErrorEvent) => any;
+    onfocus: (this: HTMLBodyElement, ev: FocusEvent) => any;
+    onhashchange: (this: HTMLBodyElement, ev: HashChangeEvent) => any;
+    onload: (this: HTMLBodyElement, ev: Event) => any;
+    onmessage: (this: HTMLBodyElement, ev: MessageEvent) => any;
+    onoffline: (this: HTMLBodyElement, ev: Event) => any;
+    ononline: (this: HTMLBodyElement, ev: Event) => any;
+    onorientationchange: (this: HTMLBodyElement, ev: Event) => any;
+    onpagehide: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
+    onpageshow: (this: HTMLBodyElement, ev: PageTransitionEvent) => any;
+    onpopstate: (this: HTMLBodyElement, ev: PopStateEvent) => any;
+    onresize: (this: HTMLBodyElement, ev: UIEvent) => any;
+    onstorage: (this: HTMLBodyElement, ev: StorageEvent) => any;
+    onunload: (this: HTMLBodyElement, ev: Event) => any;
     text: any;
     vLink: any;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (this: this, ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLBodyElementEventMap>(type: K, listener: (this: HTMLBodyElement, ev: HTMLBodyElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4427,6 +3921,8 @@ interface HTMLButtonElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLButtonElement: {
@@ -4460,6 +3956,8 @@ interface HTMLCanvasElement extends HTMLElement {
       */
     toDataURL(type?: string, ...args: any[]): string;
     toBlob(callback: (result: Blob | null) => void, type?: string, ...arguments: any[]): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLCanvasElement: {
@@ -4490,6 +3988,8 @@ declare var HTMLCollection: {
 
 interface HTMLDListElement extends HTMLElement {
     compact: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDListElement: {
@@ -4499,6 +3999,8 @@ declare var HTMLDListElement: {
 
 interface HTMLDataListElement extends HTMLElement {
     options: HTMLCollectionOf<HTMLOptionElement>;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDataListElement: {
@@ -4508,6 +4010,8 @@ declare var HTMLDataListElement: {
 
 interface HTMLDirectoryElement extends HTMLElement {
     compact: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDirectoryElement: {
@@ -4524,6 +4028,8 @@ interface HTMLDivElement extends HTMLElement {
       * Sets or retrieves whether the browser automatically performs wordwrap.
       */
     noWrap: boolean;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDivElement: {
@@ -4532,6 +4038,8 @@ declare var HTMLDivElement: {
 }
 
 interface HTMLDocument extends Document {
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLDocument: {
@@ -4539,6 +4047,76 @@ declare var HTMLDocument: {
     new(): HTMLDocument;
 }
 
+interface HTMLElementEventMap extends ElementEventMap {
+    "abort": UIEvent;
+    "activate": UIEvent;
+    "beforeactivate": UIEvent;
+    "beforecopy": ClipboardEvent;
+    "beforecut": ClipboardEvent;
+    "beforedeactivate": UIEvent;
+    "beforepaste": ClipboardEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "contextmenu": PointerEvent;
+    "copy": ClipboardEvent;
+    "cuechange": Event;
+    "cut": ClipboardEvent;
+    "dblclick": MouseEvent;
+    "deactivate": UIEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "mousedown": MouseEvent;
+    "mouseenter": MouseEvent;
+    "mouseleave": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSContentZoom": UIEvent;
+    "MSManipulationStateChanged": MSManipulationEvent;
+    "paste": ClipboardEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "reset": Event;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "selectstart": Event;
+    "stalled": Event;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "volumechange": Event;
+    "waiting": Event;
+}
+
 interface HTMLElement extends Element {
     accessKey: string;
     readonly children: HTMLCollection;
@@ -4557,73 +4135,73 @@ interface HTMLElement extends Element {
     readonly offsetParent: Element;
     readonly offsetTop: number;
     readonly offsetWidth: number;
-    onabort: (this: this, ev: UIEvent) => any;
-    onactivate: (this: this, ev: UIEvent) => any;
-    onbeforeactivate: (this: this, ev: UIEvent) => any;
-    onbeforecopy: (this: this, ev: ClipboardEvent) => any;
-    onbeforecut: (this: this, ev: ClipboardEvent) => any;
-    onbeforedeactivate: (this: this, ev: UIEvent) => any;
-    onbeforepaste: (this: this, ev: ClipboardEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
-    onchange: (this: this, ev: Event) => any;
-    onclick: (this: this, ev: MouseEvent) => any;
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
-    oncopy: (this: this, ev: ClipboardEvent) => any;
-    oncuechange: (this: this, ev: Event) => any;
-    oncut: (this: this, ev: ClipboardEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    ondeactivate: (this: this, ev: UIEvent) => any;
-    ondrag: (this: this, ev: DragEvent) => any;
-    ondragend: (this: this, ev: DragEvent) => any;
-    ondragenter: (this: this, ev: DragEvent) => any;
-    ondragleave: (this: this, ev: DragEvent) => any;
-    ondragover: (this: this, ev: DragEvent) => any;
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
-    ondurationchange: (this: this, ev: Event) => any;
-    onemptied: (this: this, ev: Event) => any;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadeddata: (this: this, ev: Event) => any;
-    onloadedmetadata: (this: this, ev: Event) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmouseenter: (this: this, ev: MouseEvent) => any;
-    onmouseleave: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmscontentzoom: (this: this, ev: UIEvent) => any;
-    onmsmanipulationstatechanged: (this: this, ev: MSManipulationEvent) => any;
-    onpaste: (this: this, ev: ClipboardEvent) => any;
-    onpause: (this: this, ev: Event) => any;
-    onplay: (this: this, ev: Event) => any;
-    onplaying: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onratechange: (this: this, ev: Event) => any;
-    onreset: (this: this, ev: Event) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onseeked: (this: this, ev: Event) => any;
-    onseeking: (this: this, ev: Event) => any;
-    onselect: (this: this, ev: UIEvent) => any;
-    onselectstart: (this: this, ev: Event) => any;
-    onstalled: (this: this, ev: Event) => any;
-    onsubmit: (this: this, ev: Event) => any;
-    onsuspend: (this: this, ev: Event) => any;
-    ontimeupdate: (this: this, ev: Event) => any;
-    onvolumechange: (this: this, ev: Event) => any;
-    onwaiting: (this: this, ev: Event) => any;
+    onabort: (this: HTMLElement, ev: UIEvent) => any;
+    onactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforecopy: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onbeforecut: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onbeforedeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    onbeforepaste: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onblur: (this: HTMLElement, ev: FocusEvent) => any;
+    oncanplay: (this: HTMLElement, ev: Event) => any;
+    oncanplaythrough: (this: HTMLElement, ev: Event) => any;
+    onchange: (this: HTMLElement, ev: Event) => any;
+    onclick: (this: HTMLElement, ev: MouseEvent) => any;
+    oncontextmenu: (this: HTMLElement, ev: PointerEvent) => any;
+    oncopy: (this: HTMLElement, ev: ClipboardEvent) => any;
+    oncuechange: (this: HTMLElement, ev: Event) => any;
+    oncut: (this: HTMLElement, ev: ClipboardEvent) => any;
+    ondblclick: (this: HTMLElement, ev: MouseEvent) => any;
+    ondeactivate: (this: HTMLElement, ev: UIEvent) => any;
+    ondrag: (this: HTMLElement, ev: DragEvent) => any;
+    ondragend: (this: HTMLElement, ev: DragEvent) => any;
+    ondragenter: (this: HTMLElement, ev: DragEvent) => any;
+    ondragleave: (this: HTMLElement, ev: DragEvent) => any;
+    ondragover: (this: HTMLElement, ev: DragEvent) => any;
+    ondragstart: (this: HTMLElement, ev: DragEvent) => any;
+    ondrop: (this: HTMLElement, ev: DragEvent) => any;
+    ondurationchange: (this: HTMLElement, ev: Event) => any;
+    onemptied: (this: HTMLElement, ev: Event) => any;
+    onended: (this: HTMLElement, ev: MediaStreamErrorEvent) => any;
+    onerror: (this: HTMLElement, ev: ErrorEvent) => any;
+    onfocus: (this: HTMLElement, ev: FocusEvent) => any;
+    oninput: (this: HTMLElement, ev: Event) => any;
+    oninvalid: (this: HTMLElement, ev: Event) => any;
+    onkeydown: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onkeypress: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onkeyup: (this: HTMLElement, ev: KeyboardEvent) => any;
+    onload: (this: HTMLElement, ev: Event) => any;
+    onloadeddata: (this: HTMLElement, ev: Event) => any;
+    onloadedmetadata: (this: HTMLElement, ev: Event) => any;
+    onloadstart: (this: HTMLElement, ev: Event) => any;
+    onmousedown: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseenter: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseleave: (this: HTMLElement, ev: MouseEvent) => any;
+    onmousemove: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseout: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseover: (this: HTMLElement, ev: MouseEvent) => any;
+    onmouseup: (this: HTMLElement, ev: MouseEvent) => any;
+    onmousewheel: (this: HTMLElement, ev: WheelEvent) => any;
+    onmscontentzoom: (this: HTMLElement, ev: UIEvent) => any;
+    onmsmanipulationstatechanged: (this: HTMLElement, ev: MSManipulationEvent) => any;
+    onpaste: (this: HTMLElement, ev: ClipboardEvent) => any;
+    onpause: (this: HTMLElement, ev: Event) => any;
+    onplay: (this: HTMLElement, ev: Event) => any;
+    onplaying: (this: HTMLElement, ev: Event) => any;
+    onprogress: (this: HTMLElement, ev: ProgressEvent) => any;
+    onratechange: (this: HTMLElement, ev: Event) => any;
+    onreset: (this: HTMLElement, ev: Event) => any;
+    onscroll: (this: HTMLElement, ev: UIEvent) => any;
+    onseeked: (this: HTMLElement, ev: Event) => any;
+    onseeking: (this: HTMLElement, ev: Event) => any;
+    onselect: (this: HTMLElement, ev: UIEvent) => any;
+    onselectstart: (this: HTMLElement, ev: Event) => any;
+    onstalled: (this: HTMLElement, ev: Event) => any;
+    onsubmit: (this: HTMLElement, ev: Event) => any;
+    onsuspend: (this: HTMLElement, ev: Event) => any;
+    ontimeupdate: (this: HTMLElement, ev: Event) => any;
+    onvolumechange: (this: HTMLElement, ev: Event) => any;
+    onwaiting: (this: HTMLElement, ev: Event) => any;
     outerHTML: string;
     outerText: string;
     spellcheck: boolean;
@@ -4636,109 +4214,7 @@ interface HTMLElement extends Element {
     focus(): void;
     msGetInputContext(): MSInputMethodContext;
     setActive(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4794,6 +4270,7 @@ interface HTMLEmbedElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4833,6 +4310,8 @@ interface HTMLFieldSetElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLFieldSetElement: {
@@ -4845,6 +4324,7 @@ interface HTMLFontElement extends HTMLElement, DOML2DeprecatedColorProperty, DOM
       * Sets or retrieves the current typeface family.
       */
     face: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -4920,6 +4400,8 @@ interface HTMLFormElement extends HTMLElement {
       * Fires when a FORM is about to be submitted.
       */
     submit(): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -4928,6 +4410,10 @@ declare var HTMLFormElement: {
     new(): HTMLFormElement;
 }
 
+interface HTMLFrameElementEventMap extends HTMLElementEventMap {
+    "load": Event;
+}
+
 interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Specifies the properties of a border drawn around an object.
@@ -4980,7 +4466,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: HTMLFrameElement, ev: Event) => any;
     /**
       * Sets or retrieves whether the frame can be scrolled.
       */
@@ -4993,110 +4479,7 @@ interface HTMLFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string | number;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLFrameElementEventMap>(type: K, listener: (this: HTMLFrameElement, ev: HTMLFrameElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5105,6 +4488,25 @@ declare var HTMLFrameElement: {
     new(): HTMLFrameElement;
 }
 
+interface HTMLFrameSetElementEventMap extends HTMLElementEventMap {
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "error": ErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "load": Event;
+    "message": MessageEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "resize": UIEvent;
+    "storage": StorageEvent;
+    "unload": Event;
+}
+
 interface HTMLFrameSetElement extends HTMLElement {
     border: string;
     /**
@@ -5124,152 +4526,34 @@ interface HTMLFrameSetElement extends HTMLElement {
       */
     frameSpacing: any;
     name: string;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
+    onafterprint: (this: HTMLFrameSetElement, ev: Event) => any;
+    onbeforeprint: (this: HTMLFrameSetElement, ev: Event) => any;
+    onbeforeunload: (this: HTMLFrameSetElement, ev: BeforeUnloadEvent) => any;
     /**
       * Fires when the object loses the input focus.
       */
-    onblur: (this: this, ev: FocusEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onblur: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
+    onerror: (this: HTMLFrameSetElement, ev: ErrorEvent) => any;
     /**
       * Fires when the object receives focus.
       */
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onunload: (this: this, ev: Event) => any;
+    onfocus: (this: HTMLFrameSetElement, ev: FocusEvent) => any;
+    onhashchange: (this: HTMLFrameSetElement, ev: HashChangeEvent) => any;
+    onload: (this: HTMLFrameSetElement, ev: Event) => any;
+    onmessage: (this: HTMLFrameSetElement, ev: MessageEvent) => any;
+    onoffline: (this: HTMLFrameSetElement, ev: Event) => any;
+    ononline: (this: HTMLFrameSetElement, ev: Event) => any;
+    onorientationchange: (this: HTMLFrameSetElement, ev: Event) => any;
+    onpagehide: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
+    onpageshow: (this: HTMLFrameSetElement, ev: PageTransitionEvent) => any;
+    onresize: (this: HTMLFrameSetElement, ev: UIEvent) => any;
+    onstorage: (this: HTMLFrameSetElement, ev: StorageEvent) => any;
+    onunload: (this: HTMLFrameSetElement, ev: Event) => any;
     /**
       * Sets or retrieves the frame heights of the object.
       */
     rows: string;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLFrameSetElementEventMap>(type: K, listener: (this: HTMLFrameSetElement, ev: HTMLFrameSetElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5291,6 +4575,7 @@ interface HTMLHRElement extends HTMLElement, DOML2DeprecatedColorProperty, DOML2
       * Sets or retrieves the width of the object.
       */
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5301,6 +4586,8 @@ declare var HTMLHRElement: {
 
 interface HTMLHeadElement extends HTMLElement {
     profile: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadElement: {
@@ -5313,6 +4600,8 @@ interface HTMLHeadingElement extends HTMLElement {
       * Sets or retrieves a value that indicates the table alignment.
       */
     align: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHeadingElement: {
@@ -5325,6 +4614,8 @@ interface HTMLHtmlElement extends HTMLElement {
       * Sets or retrieves the DTD version that governs the current document.
       */
     version: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLHtmlElement: {
@@ -5332,6 +4623,10 @@ declare var HTMLHtmlElement: {
     new(): HTMLHtmlElement;
 }
 
+interface HTMLIFrameElementEventMap extends HTMLElementEventMap {
+    "load": Event;
+}
+
 interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Sets or retrieves how the object is aligned with adjacent text.
@@ -5389,7 +4684,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
     /**
       * Raised when the object has been completely received from the server.
       */
-    onload: (this: this, ev: Event) => any;
+    onload: (this: HTMLIFrameElement, ev: Event) => any;
     readonly sandbox: DOMSettableTokenList;
     /**
       * Sets or retrieves whether the frame can be scrolled.
@@ -5407,110 +4702,7 @@ interface HTMLIFrameElement extends HTMLElement, GetSVGDocument {
       * Sets or retrieves the width of the object.
       */
     width: string;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLIFrameElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLIFrameElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5601,6 +4793,8 @@ interface HTMLImageElement extends HTMLElement {
     readonly x: number;
     readonly y: number;
     msGetAsCastingSource(): any;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLImageElement: {
@@ -5812,6 +5006,8 @@ interface HTMLInputElement extends HTMLElement {
       * @param n Value to increment the value by.
       */
     stepUp(n?: number): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLInputElement: {
@@ -5825,6 +5021,8 @@ interface HTMLLIElement extends HTMLElement {
       * Sets or retrieves the value of a list item.
       */
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLIElement: {
@@ -5841,6 +5039,8 @@ interface HTMLLabelElement extends HTMLElement {
       * Sets or retrieves the object to which the given label object is assigned.
       */
     htmlFor: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLabelElement: {
@@ -5857,6 +5057,8 @@ interface HTMLLegendElement extends HTMLElement {
       * Retrieves a reference to the form that the object is embedded in.
       */
     readonly form: HTMLFormElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLLegendElement: {
@@ -5900,6 +5102,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
     type: string;
     import?: Document;
     integrity: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -5917,6 +5120,8 @@ interface HTMLMapElement extends HTMLElement {
       * Sets or retrieves the name of the object.
       */
     name: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMapElement: {
@@ -5924,6 +5129,12 @@ declare var HTMLMapElement: {
     new(): HTMLMapElement;
 }
 
+interface HTMLMarqueeElementEventMap extends HTMLElementEventMap {
+    "bounce": Event;
+    "finish": Event;
+    "start": Event;
+}
+
 interface HTMLMarqueeElement extends HTMLElement {
     behavior: string;
     bgColor: any;
@@ -5931,9 +5142,9 @@ interface HTMLMarqueeElement extends HTMLElement {
     height: string;
     hspace: number;
     loop: number;
-    onbounce: (this: this, ev: Event) => any;
-    onfinish: (this: this, ev: Event) => any;
-    onstart: (this: this, ev: Event) => any;
+    onbounce: (this: HTMLMarqueeElement, ev: Event) => any;
+    onfinish: (this: HTMLMarqueeElement, ev: Event) => any;
+    onstart: (this: HTMLMarqueeElement, ev: Event) => any;
     scrollAmount: number;
     scrollDelay: number;
     trueSpeed: boolean;
@@ -5941,112 +5152,7 @@ interface HTMLMarqueeElement extends HTMLElement {
     width: string;
     start(): void;
     stop(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "bounce", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "finish", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "start", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLMarqueeElementEventMap>(type: K, listener: (this: HTMLMarqueeElement, ev: HTMLMarqueeElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6055,6 +5161,11 @@ declare var HTMLMarqueeElement: {
     new(): HTMLMarqueeElement;
 }
 
+interface HTMLMediaElementEventMap extends HTMLElementEventMap {
+    "encrypted": MediaEncryptedEvent;
+    "msneedkey": MSMediaKeyNeededEvent;
+}
+
 interface HTMLMediaElement extends HTMLElement {
     /**
       * Returns an AudioTrackList object with the audio tracks for a given video element.
@@ -6144,8 +5255,8 @@ interface HTMLMediaElement extends HTMLElement {
       * Gets the current network activity for the element.
       */
     readonly networkState: number;
-    onencrypted: (this: this, ev: MediaEncryptedEvent) => any;
-    onmsneedkey: (this: this, ev: MSMediaKeyNeededEvent) => any;
+    onencrypted: (this: HTMLMediaElement, ev: MediaEncryptedEvent) => any;
+    onmsneedkey: (this: HTMLMediaElement, ev: MSMediaKeyNeededEvent) => any;
     /**
       * Gets a flag that specifies whether playback is paused.
       */
@@ -6223,111 +5334,7 @@ interface HTMLMediaElement extends HTMLElement {
     readonly NETWORK_IDLE: number;
     readonly NETWORK_LOADING: number;
     readonly NETWORK_NO_SOURCE: number;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "encrypted", listener: (this: this, ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (this: this, ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLMediaElement, ev: HTMLMediaElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6348,6 +5355,8 @@ declare var HTMLMediaElement: {
 interface HTMLMenuElement extends HTMLElement {
     compact: boolean;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMenuElement: {
@@ -6380,6 +5389,8 @@ interface HTMLMetaElement extends HTMLElement {
       * Sets or retrieves the URL property that will be loaded after the specified time has elapsed. 
       */
     url: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMetaElement: {
@@ -6394,6 +5405,8 @@ interface HTMLMeterElement extends HTMLElement {
     min: number;
     optimum: number;
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLMeterElement: {
@@ -6410,6 +5423,8 @@ interface HTMLModElement extends HTMLElement {
       * Sets or retrieves the date and time of a modification to the object.
       */
     dateTime: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLModElement: {
@@ -6424,6 +5439,8 @@ interface HTMLOListElement extends HTMLElement {
       */
     start: number;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOListElement: {
@@ -6543,6 +5560,7 @@ interface HTMLObjectElement extends HTMLElement, GetSVGDocument {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6581,6 +5599,8 @@ interface HTMLOptGroupElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOptGroupElement: {
@@ -6618,6 +5638,8 @@ interface HTMLOptionElement extends HTMLElement {
       * Sets or retrieves the value which is returned to the server when the form control is submitted.
       */
     value: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLOptionElement: {
@@ -6644,6 +5666,8 @@ interface HTMLParagraphElement extends HTMLElement {
       */
     align: string;
     clear: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLParagraphElement: {
@@ -6668,6 +5692,8 @@ interface HTMLParamElement extends HTMLElement {
       * Sets or retrieves the data type of the value attribute.
       */
     valueType: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLParamElement: {
@@ -6676,6 +5702,8 @@ declare var HTMLParamElement: {
 }
 
 interface HTMLPictureElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLPictureElement: {
@@ -6688,6 +5716,8 @@ interface HTMLPreElement extends HTMLElement {
       * Sets or gets a value that you can use to implement your own width functionality for the object.
       */
     width: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLPreElement: {
@@ -6712,6 +5742,8 @@ interface HTMLProgressElement extends HTMLElement {
       * Sets or gets the current value of a progress element. The value must be a non-negative number between 0 and the max value.
       */
     value: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLProgressElement: {
@@ -6724,6 +5756,8 @@ interface HTMLQuoteElement extends HTMLElement {
       * Sets or retrieves reference information about the object.
       */
     cite: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLQuoteElement: {
@@ -6762,6 +5796,8 @@ interface HTMLScriptElement extends HTMLElement {
       */
     type: string;
     integrity: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLScriptElement: {
@@ -6856,6 +5892,8 @@ interface HTMLSelectElement extends HTMLElement {
       * @param error Sets a custom error message that is displayed when a form is submitted.
       */
     setCustomValidity(error: string): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [name: string]: any;
 }
 
@@ -6880,6 +5918,8 @@ interface HTMLSourceElement extends HTMLElement {
      * Gets or sets the MIME type of a media resource.
      */
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLSourceElement: {
@@ -6888,6 +5928,8 @@ declare var HTMLSourceElement: {
 }
 
 interface HTMLSpanElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLSpanElement: {
@@ -6905,6 +5947,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle {
       * Retrieves the CSS language in which the style sheet is written.
       */
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6922,6 +5965,8 @@ interface HTMLTableCaptionElement extends HTMLElement {
       * Sets or retrieves whether the caption appears at the top or bottom of the table.
       */
     vAlign: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableCaptionElement: {
@@ -6975,6 +6020,7 @@ interface HTMLTableCellElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -6996,6 +6042,7 @@ interface HTMLTableColElement extends HTMLElement, HTMLTableAlignment {
       * Sets or retrieves the width of the object.
       */
     width: any;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7116,6 +6163,8 @@ interface HTMLTableElement extends HTMLElement {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTableElement: {
@@ -7167,6 +6216,7 @@ interface HTMLTableRowElement extends HTMLElement, HTMLTableAlignment {
       * @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): HTMLTableDataCellElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7194,6 +6244,7 @@ interface HTMLTableSectionElement extends HTMLElement, HTMLTableAlignment {
       * @param index Number that specifies where to insert the row in the rows collection. The default value is -1, which appends the new row to the end of the rows collection.
       */
     insertRow(index?: number): HTMLTableRowElement;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7204,6 +6255,8 @@ declare var HTMLTableSectionElement: {
 
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTemplateElement: {
@@ -7309,6 +6362,8 @@ interface HTMLTextAreaElement extends HTMLElement {
       * @param end The offset into the text field for the end of the selection.
       */
     setSelectionRange(start: number, end: number): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTextAreaElement: {
@@ -7321,6 +6376,8 @@ interface HTMLTitleElement extends HTMLElement {
       * Retrieves or sets the text of the object as a string. 
       */
     text: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTitleElement: {
@@ -7340,6 +6397,8 @@ interface HTMLTrackElement extends HTMLElement {
     readonly LOADED: number;
     readonly LOADING: number;
     readonly NONE: number;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLTrackElement: {
@@ -7354,6 +6413,8 @@ declare var HTMLTrackElement: {
 interface HTMLUListElement extends HTMLElement {
     compact: boolean;
     type: string;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLUListElement: {
@@ -7362,6 +6423,8 @@ declare var HTMLUListElement: {
 }
 
 interface HTMLUnknownElement extends HTMLElement {
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var HTMLUnknownElement: {
@@ -7369,6 +6432,12 @@ declare var HTMLUnknownElement: {
     new(): HTMLUnknownElement;
 }
 
+interface HTMLVideoElementEventMap extends HTMLMediaElementEventMap {
+    "MSVideoFormatChanged": Event;
+    "MSVideoFrameStepCompleted": Event;
+    "MSVideoOptimalLayoutChanged": Event;
+}
+
 interface HTMLVideoElement extends HTMLMediaElement {
     /**
       * Gets or sets the height of the video element.
@@ -7380,9 +6449,9 @@ interface HTMLVideoElement extends HTMLMediaElement {
     msStereo3DPackingMode: string;
     msStereo3DRenderMode: string;
     msZoom: boolean;
-    onMSVideoFormatChanged: (this: this, ev: Event) => any;
-    onMSVideoFrameStepCompleted: (this: this, ev: Event) => any;
-    onMSVideoOptimalLayoutChanged: (this: this, ev: Event) => any;
+    onMSVideoFormatChanged: (this: HTMLVideoElement, ev: Event) => any;
+    onMSVideoFrameStepCompleted: (this: HTMLVideoElement, ev: Event) => any;
+    onMSVideoOptimalLayoutChanged: (this: HTMLVideoElement, ev: Event) => any;
     /**
       * Gets or sets a URL of an image to display, for example, like a movie poster. This can be a still frame from the video, or another image if no video data is available.
       */
@@ -7409,114 +6478,7 @@ interface HTMLVideoElement extends HTMLMediaElement {
     webkitEnterFullscreen(): void;
     webkitExitFullScreen(): void;
     webkitExitFullscreen(): void;
-    addEventListener(type: "MSContentZoom", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSManipulationStateChanged", listener: (this: this, ev: MSManipulationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFormatChanged", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoFrameStepCompleted", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSVideoOptimalLayoutChanged", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "activate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecopy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforecut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforedeactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforepaste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "copy", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "cut", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deactivate", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "encrypted", listener: (this: this, ev: MediaEncryptedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "msneedkey", listener: (this: this, ev: MSMediaKeyNeededEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "paste", listener: (this: this, ev: ClipboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "selectstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof HTMLVideoElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLVideoElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7584,11 +6546,16 @@ declare var IDBCursorWithValue: {
     new(): IDBCursorWithValue;
 }
 
+interface IDBDatabaseEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBDatabase, ev: Event) => any;
+    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -7596,8 +6563,7 @@ interface IDBDatabase extends EventTarget {
     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: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7674,13 +6640,15 @@ declare var IDBObjectStore: {
     new(): IDBObjectStore;
 }
 
+interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
+    "blocked": Event;
+    "upgradeneeded": IDBVersionChangeEvent;
+}
+
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: this, ev: Event) => any;
-    onupgradeneeded: (this: this, ev: IDBVersionChangeEvent) => any;
-    addEventListener(type: "blocked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "upgradeneeded", listener: (this: this, ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
+    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7689,16 +6657,20 @@ declare var IDBOpenDBRequest: {
     new(): IDBOpenDBRequest;
 }
 
+interface IDBRequestEventMap {
+    "error": ErrorEvent;
+    "success": Event;
+}
+
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onsuccess: (this: this, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7707,21 +6679,25 @@ declare var IDBRequest: {
     new(): IDBRequest;
 }
 
+interface IDBTransactionEventMap {
+    "abort": Event;
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: this, ev: Event) => any;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBTransaction, ev: Event) => any;
+    oncomplete: (this: IDBTransaction, ev: Event) => any;
+    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -7854,18 +6830,22 @@ interface MSApp {
 }
 declare var MSApp: MSApp;
 
+interface MSAppAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
+    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
     readonly COMPLETED: number;
     readonly ERROR: number;
     readonly STARTED: number;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8020,6 +7000,8 @@ interface MSHTMLWebViewElement extends HTMLElement {
     navigateWithHttpRequestMessage(requestMessage: any): void;
     refresh(): void;
     stop(): void;
+    addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var MSHTMLWebViewElement: {
@@ -8027,20 +7009,24 @@ declare var MSHTMLWebViewElement: {
     new(): MSHTMLWebViewElement;
 }
 
+interface MSInputMethodContextEventMap {
+    "MSCandidateWindowHide": Event;
+    "MSCandidateWindowShow": Event;
+    "MSCandidateWindowUpdate": Event;
+}
+
 interface MSInputMethodContext extends EventTarget {
     readonly compositionEndOffset: number;
     readonly compositionStartOffset: number;
-    oncandidatewindowhide: (this: this, ev: Event) => any;
-    oncandidatewindowshow: (this: this, ev: Event) => any;
-    oncandidatewindowupdate: (this: this, ev: Event) => any;
+    oncandidatewindowhide: (this: MSInputMethodContext, ev: Event) => any;
+    oncandidatewindowshow: (this: MSInputMethodContext, ev: Event) => any;
+    oncandidatewindowupdate: (this: MSInputMethodContext, ev: Event) => any;
     readonly target: HTMLElement;
     getCandidateWindowClientRect(): ClientRect;
     getCompositionAlternatives(): string[];
     hasComposition(): boolean;
     isCandidateWindowVisible(): boolean;
-    addEventListener(type: "MSCandidateWindowHide", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowShow", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSCandidateWindowUpdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSInputMethodContextEventMap>(type: K, listener: (this: MSInputMethodContext, ev: MSInputMethodContextEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8206,6 +7192,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsBlob(stream: MSStream, size?: number): void;
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8214,10 +7201,15 @@ declare var MSStreamReader: {
     new(): MSStreamReader;
 }
 
+interface MSWebViewAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSWebViewAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSWebViewAsyncOperation, ev: Event) => any;
+    onerror: (this: MSWebViewAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     readonly target: MSHTMLWebViewElement;
@@ -8229,8 +7221,7 @@ interface MSWebViewAsyncOperation extends EventTarget {
     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: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSWebViewAsyncOperationEventMap>(type: K, listener: (this: MSWebViewAsyncOperation, ev: MSWebViewAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8267,12 +7258,16 @@ declare var MediaDeviceInfo: {
     new(): MediaDeviceInfo;
 }
 
+interface MediaDevicesEventMap {
+    "devicechange": Event;
+}
+
 interface MediaDevices extends EventTarget {
-    ondevicechange: (this: this, ev: Event) => any;
+    ondevicechange: (this: MediaDevices, ev: Event) => any;
     enumerateDevices(): any;
     getSupportedConstraints(): MediaTrackSupportedConstraints;
     getUserMedia(constraints: MediaStreamConstraints): PromiseLike<MediaStream>;
-    addEventListener(type: "devicechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaDevicesEventMap>(type: K, listener: (this: MediaDevices, ev: MediaDevicesEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8422,13 +7417,20 @@ declare var MediaSource: {
     isTypeSupported(type: string): boolean;
 }
 
+interface MediaStreamEventMap {
+    "active": Event;
+    "addtrack": TrackEvent;
+    "inactive": Event;
+    "removetrack": TrackEvent;
+}
+
 interface MediaStream extends EventTarget {
     readonly active: boolean;
     readonly id: string;
-    onactive: (this: this, ev: Event) => any;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    oninactive: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onactive: (this: MediaStream, ev: Event) => any;
+    onaddtrack: (this: MediaStream, ev: TrackEvent) => any;
+    oninactive: (this: MediaStream, ev: Event) => any;
+    onremovetrack: (this: MediaStream, ev: TrackEvent) => any;
     addTrack(track: MediaStreamTrack): void;
     clone(): MediaStream;
     getAudioTracks(): MediaStreamTrack[];
@@ -8437,10 +7439,7 @@ interface MediaStream extends EventTarget {
     getVideoTracks(): MediaStreamTrack[];
     removeTrack(track: MediaStreamTrack): void;
     stop(): void;
-    addEventListener(type: "active", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "inactive", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaStreamEventMap>(type: K, listener: (this: MediaStream, ev: MediaStreamEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8477,16 +7476,23 @@ declare var MediaStreamErrorEvent: {
     new(type: string, eventInitDict?: MediaStreamErrorEventInit): MediaStreamErrorEvent;
 }
 
+interface MediaStreamTrackEventMap {
+    "ended": MediaStreamErrorEvent;
+    "mute": Event;
+    "overconstrained": MediaStreamErrorEvent;
+    "unmute": Event;
+}
+
 interface MediaStreamTrack extends EventTarget {
     enabled: boolean;
     readonly id: string;
     readonly kind: string;
     readonly label: string;
     readonly muted: boolean;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
-    onmute: (this: this, ev: Event) => any;
-    onoverconstrained: (this: this, ev: MediaStreamErrorEvent) => any;
-    onunmute: (this: this, ev: Event) => any;
+    onended: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
+    onmute: (this: MediaStreamTrack, ev: Event) => any;
+    onoverconstrained: (this: MediaStreamTrack, ev: MediaStreamErrorEvent) => any;
+    onunmute: (this: MediaStreamTrack, ev: Event) => any;
     readonly readonly: boolean;
     readonly readyState: string;
     readonly remote: boolean;
@@ -8496,10 +7502,7 @@ interface MediaStreamTrack extends EventTarget {
     getConstraints(): MediaTrackConstraints;
     getSettings(): MediaTrackSettings;
     stop(): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mute", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "overconstrained", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "unmute", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MediaStreamTrackEventMap>(type: K, listener: (this: MediaStreamTrack, ev: MediaStreamTrackEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8540,12 +7543,16 @@ declare var MessageEvent: {
     new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
 }
 
+interface MessagePortEventMap {
+    "message": MessageEvent;
+}
+
 interface MessagePort extends EventTarget {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
     postMessage(message?: any, ports?: any): void;
     start(): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8723,7 +7730,6 @@ interface Navigator extends Object, NavigatorID, NavigatorOnLine, NavigatorConte
     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;
 }
 
 declare var Navigator: {
@@ -8898,10 +7904,14 @@ declare var OfflineAudioCompletionEvent: {
     new(): OfflineAudioCompletionEvent;
 }
 
+interface OfflineAudioContextEventMap {
+    "complete": Event;
+}
+
 interface OfflineAudioContext extends AudioContext {
-    oncomplete: (this: this, ev: Event) => any;
+    oncomplete: (this: OfflineAudioContext, ev: Event) => any;
     startRendering(): PromiseLike<AudioBuffer>;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof OfflineAudioContextEventMap>(type: K, listener: (this: OfflineAudioContext, ev: OfflineAudioContextEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -8910,15 +7920,19 @@ declare var OfflineAudioContext: {
     new(numberOfChannels: number, length: number, sampleRate: number): OfflineAudioContext;
 }
 
+interface OscillatorNodeEventMap {
+    "ended": MediaStreamErrorEvent;
+}
+
 interface OscillatorNode extends AudioNode {
     readonly detune: AudioParam;
     readonly frequency: AudioParam;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onended: (this: OscillatorNode, ev: MediaStreamErrorEvent) => any;
     type: string;
     setPeriodicWave(periodicWave: PeriodicWave): void;
     start(when?: number): void;
     stop(when?: number): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof OscillatorNodeEventMap>(type: K, listener: (this: OscillatorNode, ev: OscillatorNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9297,9 +8311,14 @@ declare var RTCDTMFToneChangeEvent: {
     new(type: string, eventInitDict: RTCDTMFToneChangeEventInit): RTCDTMFToneChangeEvent;
 }
 
+interface RTCDtlsTransportEventMap {
+    "dtlsstatechange": RTCDtlsTransportStateChangedEvent;
+    "error": ErrorEvent;
+}
+
 interface RTCDtlsTransport extends RTCStatsProvider {
-    ondtlsstatechange: ((this: this, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    ondtlsstatechange: ((this: RTCDtlsTransport, ev: RTCDtlsTransportStateChangedEvent) => any) | null;
+    onerror: ((this: RTCDtlsTransport, ev: ErrorEvent) => any) | null;
     readonly state: string;
     readonly transport: RTCIceTransport;
     getLocalParameters(): RTCDtlsParameters;
@@ -9307,8 +8326,7 @@ interface RTCDtlsTransport extends RTCStatsProvider {
     getRemoteParameters(): RTCDtlsParameters | null;
     start(remoteParameters: RTCDtlsParameters): void;
     stop(): void;
-    addEventListener(type: "dtlsstatechange", listener: (this: this, ev: RTCDtlsTransportStateChangedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCDtlsTransportEventMap>(type: K, listener: (this: RTCDtlsTransport, ev: RTCDtlsTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9326,15 +8344,19 @@ declare var RTCDtlsTransportStateChangedEvent: {
     new(): RTCDtlsTransportStateChangedEvent;
 }
 
+interface RTCDtmfSenderEventMap {
+    "tonechange": RTCDTMFToneChangeEvent;
+}
+
 interface RTCDtmfSender extends EventTarget {
     readonly canInsertDTMF: boolean;
     readonly duration: number;
     readonly interToneGap: number;
-    ontonechange: (this: this, ev: RTCDTMFToneChangeEvent) => any;
+    ontonechange: (this: RTCDtmfSender, ev: RTCDTMFToneChangeEvent) => any;
     readonly sender: RTCRtpSender;
     readonly toneBuffer: string;
     insertDTMF(tones: string, duration?: number, interToneGap?: number): void;
-    addEventListener(type: "tonechange", listener: (this: this, ev: RTCDTMFToneChangeEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCDtmfSenderEventMap>(type: K, listener: (this: RTCDtmfSender, ev: RTCDtmfSenderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9352,15 +8374,19 @@ declare var RTCIceCandidatePairChangedEvent: {
     new(): RTCIceCandidatePairChangedEvent;
 }
 
+interface RTCIceGathererEventMap {
+    "error": ErrorEvent;
+    "localcandidate": RTCIceGathererEvent;
+}
+
 interface RTCIceGatherer extends RTCStatsProvider {
     readonly component: string;
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
-    onlocalcandidate: ((this: this, ev: RTCIceGathererEvent) => any) | null;
+    onerror: ((this: RTCIceGatherer, ev: ErrorEvent) => any) | null;
+    onlocalcandidate: ((this: RTCIceGatherer, ev: RTCIceGathererEvent) => any) | null;
     createAssociatedGatherer(): RTCIceGatherer;
     getLocalCandidates(): RTCIceCandidate[];
     getLocalParameters(): RTCIceParameters;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "localcandidate", listener: (this: this, ev: RTCIceGathererEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCIceGathererEventMap>(type: K, listener: (this: RTCIceGatherer, ev: RTCIceGathererEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9378,11 +8404,16 @@ declare var RTCIceGathererEvent: {
     new(): RTCIceGathererEvent;
 }
 
+interface RTCIceTransportEventMap {
+    "candidatepairchange": RTCIceCandidatePairChangedEvent;
+    "icestatechange": RTCIceTransportStateChangedEvent;
+}
+
 interface RTCIceTransport extends RTCStatsProvider {
     readonly component: string;
     readonly iceGatherer: RTCIceGatherer | null;
-    oncandidatepairchange: ((this: this, ev: RTCIceCandidatePairChangedEvent) => any) | null;
-    onicestatechange: ((this: this, ev: RTCIceTransportStateChangedEvent) => any) | null;
+    oncandidatepairchange: ((this: RTCIceTransport, ev: RTCIceCandidatePairChangedEvent) => any) | null;
+    onicestatechange: ((this: RTCIceTransport, ev: RTCIceTransportStateChangedEvent) => any) | null;
     readonly role: string;
     readonly state: string;
     addRemoteCandidate(remoteCandidate: RTCIceCandidate | RTCIceCandidateComplete): void;
@@ -9393,8 +8424,7 @@ interface RTCIceTransport extends RTCStatsProvider {
     setRemoteCandidates(remoteCandidates: RTCIceCandidate[]): void;
     start(gatherer: RTCIceGatherer, remoteParameters: RTCIceParameters, role?: string): void;
     stop(): void;
-    addEventListener(type: "candidatepairchange", listener: (this: this, ev: RTCIceCandidatePairChangedEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "icestatechange", listener: (this: this, ev: RTCIceTransportStateChangedEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCIceTransportEventMap>(type: K, listener: (this: RTCIceTransport, ev: RTCIceTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9412,8 +8442,12 @@ declare var RTCIceTransportStateChangedEvent: {
     new(): RTCIceTransportStateChangedEvent;
 }
 
+interface RTCRtpReceiverEventMap {
+    "error": ErrorEvent;
+}
+
 interface RTCRtpReceiver extends RTCStatsProvider {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCRtpReceiver, ev: ErrorEvent) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack | null;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9422,7 +8456,7 @@ interface RTCRtpReceiver extends RTCStatsProvider {
     requestSendCSRC(csrc: number): void;
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCRtpReceiverEventMap>(type: K, listener: (this: RTCRtpReceiver, ev: RTCRtpReceiverEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9432,9 +8466,14 @@ declare var RTCRtpReceiver: {
     getCapabilities(kind?: string): RTCRtpCapabilities;
 }
 
+interface RTCRtpSenderEventMap {
+    "error": ErrorEvent;
+    "ssrcconflict": RTCSsrcConflictEvent;
+}
+
 interface RTCRtpSender extends RTCStatsProvider {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
-    onssrcconflict: ((this: this, ev: RTCSsrcConflictEvent) => any) | null;
+    onerror: ((this: RTCRtpSender, ev: ErrorEvent) => any) | null;
+    onssrcconflict: ((this: RTCRtpSender, ev: RTCSsrcConflictEvent) => any) | null;
     readonly rtcpTransport: RTCDtlsTransport;
     readonly track: MediaStreamTrack;
     readonly transport: RTCDtlsTransport | RTCSrtpSdesTransport;
@@ -9442,8 +8481,7 @@ interface RTCRtpSender extends RTCStatsProvider {
     setTrack(track: MediaStreamTrack): void;
     setTransport(transport: RTCDtlsTransport | RTCSrtpSdesTransport, rtcpTransport?: RTCDtlsTransport): void;
     stop(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ssrcconflict", listener: (this: this, ev: RTCSsrcConflictEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCRtpSenderEventMap>(type: K, listener: (this: RTCRtpSender, ev: RTCRtpSenderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9453,10 +8491,14 @@ declare var RTCRtpSender: {
     getCapabilities(kind?: string): RTCRtpCapabilities;
 }
 
+interface RTCSrtpSdesTransportEventMap {
+    "error": ErrorEvent;
+}
+
 interface RTCSrtpSdesTransport extends EventTarget {
-    onerror: ((this: this, ev: ErrorEvent) => any) | null;
+    onerror: ((this: RTCSrtpSdesTransport, ev: ErrorEvent) => any) | null;
     readonly transport: RTCIceTransport;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof RTCSrtpSdesTransportEventMap>(type: K, listener: (this: RTCSrtpSdesTransport, ev: RTCSrtpSdesTransportEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9531,6 +8573,7 @@ declare var Range: {
 
 interface SVGAElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGURIReference {
     readonly target: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9687,6 +8730,7 @@ interface SVGCircleElement extends SVGElement, SVGStylable, SVGTransformable, SV
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9697,6 +8741,7 @@ declare var SVGCircleElement: {
 
 interface SVGClipPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGUnitTypes {
     readonly clipPathUnits: SVGAnimatedEnumeration;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9719,6 +8764,8 @@ interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly SVG_FECOMPONENTTRANSFER_TYPE_LINEAR: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_TABLE: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGComponentTransferFunctionElement: {
@@ -9733,6 +8780,7 @@ declare var SVGComponentTransferFunctionElement: {
 }
 
 interface SVGDefsElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9742,6 +8790,7 @@ declare var SVGDefsElement: {
 }
 
 interface SVGDescElement extends SVGElement, SVGStylable, SVGLangSpace {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9750,67 +8799,35 @@ declare var SVGDescElement: {
     new(): SVGDescElement;
 }
 
+interface SVGElementEventMap extends ElementEventMap {
+    "click": MouseEvent;
+    "dblclick": MouseEvent;
+    "focusin": FocusEvent;
+    "focusout": FocusEvent;
+    "load": Event;
+    "mousedown": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+}
+
 interface SVGElement extends Element {
-    onclick: (this: this, ev: MouseEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    onfocusin: (this: this, ev: FocusEvent) => any;
-    onfocusout: (this: this, ev: FocusEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
+    onclick: (this: SVGElement, ev: MouseEvent) => any;
+    ondblclick: (this: SVGElement, ev: MouseEvent) => any;
+    onfocusin: (this: SVGElement, ev: FocusEvent) => any;
+    onfocusout: (this: SVGElement, ev: FocusEvent) => any;
+    onload: (this: SVGElement, ev: Event) => any;
+    onmousedown: (this: SVGElement, ev: MouseEvent) => any;
+    onmousemove: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseout: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseover: (this: SVGElement, ev: MouseEvent) => any;
+    onmouseup: (this: SVGElement, ev: MouseEvent) => any;
     readonly ownerSVGElement: SVGSVGElement;
     readonly viewportElement: SVGElement;
     xmlbase: string;
     className: any;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9850,6 +8867,7 @@ interface SVGEllipseElement extends SVGElement, SVGStylable, SVGTransformable, S
     readonly cy: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9879,6 +8897,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib
     readonly SVG_FEBLEND_MODE_SCREEN: number;
     readonly SVG_FEBLEND_MODE_SOFT_LIGHT: number;
     readonly SVG_FEBLEND_MODE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9913,6 +8932,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard
     readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
     readonly SVG_FECOLORMATRIX_TYPE_SATURATE: number;
     readonly SVG_FECOLORMATRIX_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9928,6 +8948,7 @@ declare var SVGFEColorMatrixElement: {
 
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9951,6 +8972,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt
     readonly SVG_FECOMPOSITE_OPERATOR_OVER: number;
     readonly SVG_FECOMPOSITE_OPERATOR_UNKNOWN: number;
     readonly SVG_FECOMPOSITE_OPERATOR_XOR: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -9983,6 +9005,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand
     readonly SVG_EDGEMODE_NONE: number;
     readonly SVG_EDGEMODE_UNKNOWN: number;
     readonly SVG_EDGEMODE_WRAP: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10001,6 +9024,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan
     readonly kernelUnitLengthX: SVGAnimatedNumber;
     readonly kernelUnitLengthY: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10020,6 +9044,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan
     readonly SVG_CHANNEL_G: number;
     readonly SVG_CHANNEL_R: number;
     readonly SVG_CHANNEL_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10036,6 +9061,8 @@ declare var SVGFEDisplacementMapElement: {
 interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEDistantLightElement: {
@@ -10044,6 +9071,7 @@ declare var SVGFEDistantLightElement: {
 }
 
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10089,6 +9117,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar
     readonly stdDeviationX: SVGAnimatedNumber;
     readonly stdDeviationY: SVGAnimatedNumber;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10099,6 +9128,7 @@ declare var SVGFEGaussianBlurElement: {
 
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGLangSpace, SVGURIReference, SVGExternalResourcesRequired {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10108,6 +9138,7 @@ declare var SVGFEImageElement: {
 }
 
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10118,6 +9149,8 @@ declare var SVGFEMergeElement: {
 
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEMergeNodeElement: {
@@ -10133,6 +9166,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10148,6 +9182,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri
     readonly dx: SVGAnimatedNumber;
     readonly dy: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10160,6 +9195,8 @@ interface SVGFEPointLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFEPointLightElement: {
@@ -10174,6 +9211,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta
     readonly specularConstant: SVGAnimatedNumber;
     readonly specularExponent: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10191,6 +9229,8 @@ interface SVGFESpotLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGFESpotLightElement: {
@@ -10200,6 +9240,7 @@ declare var SVGFESpotLightElement: {
 
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10221,6 +9262,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly SVG_TURBULENCE_TYPE_FRACTALNOISE: number;
     readonly SVG_TURBULENCE_TYPE_TURBULENCE: number;
     readonly SVG_TURBULENCE_TYPE_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10245,6 +9287,7 @@ interface SVGFilterElement extends SVGElement, SVGUnitTypes, SVGStylable, SVGLan
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
     setFilterRes(filterResX: number, filterResY: number): void;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10258,6 +9301,7 @@ interface SVGForeignObjectElement extends SVGElement, SVGStylable, SVGTransforma
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10267,6 +9311,7 @@ declare var SVGForeignObjectElement: {
 }
 
 interface SVGGElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10283,6 +9328,7 @@ interface SVGGradientElement extends SVGElement, SVGStylable, SVGExternalResourc
     readonly SVG_SPREADMETHOD_REFLECT: number;
     readonly SVG_SPREADMETHOD_REPEAT: number;
     readonly SVG_SPREADMETHOD_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10301,6 +9347,7 @@ interface SVGImageElement extends SVGElement, SVGStylable, SVGTransformable, SVG
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10366,6 +9413,7 @@ interface SVGLineElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10402,6 +9450,7 @@ interface SVGMarkerElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExt
     readonly SVG_MARKER_ORIENT_ANGLE: number;
     readonly SVG_MARKER_ORIENT_AUTO: number;
     readonly SVG_MARKER_ORIENT_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10423,6 +9472,7 @@ interface SVGMaskElement extends SVGElement, SVGStylable, SVGTests, SVGLangSpace
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10457,6 +9507,8 @@ declare var SVGMatrix: {
 }
 
 interface SVGMetadataElement extends SVGElement {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGMetadataElement: {
@@ -10512,6 +9564,7 @@ interface SVGPathElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     getPathSegAtLength(distance: number): number;
     getPointAtLength(distance: number): SVGPoint;
     getTotalLength(): number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10804,6 +9857,7 @@ interface SVGPatternElement extends SVGElement, SVGStylable, SVGTests, SVGLangSp
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10840,6 +9894,7 @@ declare var SVGPointList: {
 }
 
 interface SVGPolygonElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10849,6 +9904,7 @@ declare var SVGPolygonElement: {
 }
 
 interface SVGPolylineElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired, SVGAnimatedPoints {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10927,6 +9983,7 @@ interface SVGRectElement extends SVGElement, SVGStylable, SVGTransformable, SVGT
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -10935,18 +9992,27 @@ declare var SVGRectElement: {
     new(): SVGRectElement;
 }
 
+interface SVGSVGElementEventMap extends SVGElementEventMap {
+    "SVGAbort": Event;
+    "SVGError": Event;
+    "resize": UIEvent;
+    "scroll": UIEvent;
+    "SVGUnload": Event;
+    "SVGZoom": SVGZoomEvent;
+}
+
 interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTests, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
     contentScriptType: string;
     contentStyleType: string;
     currentScale: number;
     readonly currentTranslate: SVGPoint;
     readonly height: SVGAnimatedLength;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: Event) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onunload: (this: this, ev: Event) => any;
-    onzoom: (this: this, ev: SVGZoomEvent) => any;
+    onabort: (this: SVGSVGElement, ev: Event) => any;
+    onerror: (this: SVGSVGElement, ev: Event) => any;
+    onresize: (this: SVGSVGElement, ev: UIEvent) => any;
+    onscroll: (this: SVGSVGElement, ev: UIEvent) => any;
+    onunload: (this: SVGSVGElement, ev: Event) => any;
+    onzoom: (this: SVGSVGElement, ev: SVGZoomEvent) => any;
     readonly pixelUnitToMillimeterX: number;
     readonly pixelUnitToMillimeterY: number;
     readonly screenPixelToMillimeterX: number;
@@ -10978,58 +10044,7 @@ interface SVGSVGElement extends SVGElement, DocumentEvent, SVGLocatable, SVGTest
     unpauseAnimations(): void;
     unsuspendRedraw(suspendHandleID: number): void;
     unsuspendRedrawAll(): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGotPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSLostPointerCapture", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGAbort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGError", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGUnload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "SVGZoom", listener: (this: this, ev: SVGZoomEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ariarequest", listener: (this: this, ev: AriaRequestEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "command", listener: (this: this, ev: CommandEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusin", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focusout", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "gotpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "lostpointercapture", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchcancel", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchend", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchmove", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "touchstart", listener: (this: this, ev: TouchEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "webkitfullscreenerror", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof SVGSVGElementEventMap>(type: K, listener: (this: SVGSVGElement, ev: SVGSVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11040,6 +10055,7 @@ declare var SVGSVGElement: {
 
 interface SVGScriptElement extends SVGElement, SVGExternalResourcesRequired, SVGURIReference {
     type: string;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11050,6 +10066,7 @@ declare var SVGScriptElement: {
 
 interface SVGStopElement extends SVGElement, SVGStylable {
     readonly offset: SVGAnimatedNumber;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11079,6 +10096,7 @@ interface SVGStyleElement extends SVGElement, SVGLangSpace {
     media: string;
     title: string;
     type: string;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11088,6 +10106,7 @@ declare var SVGStyleElement: {
 }
 
 interface SVGSwitchElement extends SVGElement, SVGStylable, SVGTransformable, SVGTests, SVGLangSpace, SVGExternalResourcesRequired {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11097,6 +10116,7 @@ declare var SVGSwitchElement: {
 }
 
 interface SVGSymbolElement extends SVGElement, SVGStylable, SVGLangSpace, SVGExternalResourcesRequired, SVGFitToViewBox {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11128,6 +10148,7 @@ interface SVGTextContentElement extends SVGElement, SVGStylable, SVGTests, SVGLa
     readonly LENGTHADJUST_SPACING: number;
     readonly LENGTHADJUST_SPACINGANDGLYPHS: number;
     readonly LENGTHADJUST_UNKNOWN: number;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11140,7 +10161,6 @@ declare var SVGTextContentElement: {
 }
 
 interface SVGTextElement extends SVGTextPositioningElement, SVGTransformable {
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var SVGTextElement: {
@@ -11158,7 +10178,6 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     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: {
@@ -11186,6 +10205,7 @@ declare var SVGTextPositioningElement: {
 }
 
 interface SVGTitleElement extends SVGElement, SVGStylable, SVGLangSpace {
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11257,6 +10277,7 @@ interface SVGUseElement extends SVGElement, SVGStylable, SVGTransformable, SVGTe
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11267,6 +10288,7 @@ declare var SVGUseElement: {
 
 interface SVGViewElement extends SVGElement, SVGExternalResourcesRequired, SVGFitToViewBox, SVGZoomAndPan {
     readonly viewTarget: SVGStringList;
+    addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11298,6 +10320,10 @@ declare var SVGZoomEvent: {
     new(): SVGZoomEvent;
 }
 
+interface ScreenEventMap {
+    "MSOrientationChange": Event;
+}
+
 interface Screen extends EventTarget {
     readonly availHeight: number;
     readonly availWidth: number;
@@ -11310,14 +10336,14 @@ interface Screen extends EventTarget {
     readonly logicalXDPI: number;
     readonly logicalYDPI: number;
     readonly msOrientation: string;
-    onmsorientationchange: (this: this, ev: Event) => any;
+    onmsorientationchange: (this: Screen, ev: Event) => any;
     readonly pixelDepth: number;
     readonly systemXDPI: number;
     readonly systemYDPI: number;
     readonly width: number;
     msLockOrientation(orientations: string | string[]): boolean;
     msUnlockOrientation(): void;
-    addEventListener(type: "MSOrientationChange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof ScreenEventMap>(type: K, listener: (this: Screen, ev: ScreenEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11336,10 +10362,14 @@ declare var ScriptNotifyEvent: {
     new(): ScriptNotifyEvent;
 }
 
+interface ScriptProcessorNodeEventMap {
+    "audioprocess": AudioProcessingEvent;
+}
+
 interface ScriptProcessorNode extends AudioNode {
     readonly bufferSize: number;
-    onaudioprocess: (this: this, ev: AudioProcessingEvent) => any;
-    addEventListener(type: "audioprocess", listener: (this: this, ev: AudioProcessingEvent) => any, useCapture?: boolean): void;
+    onaudioprocess: (this: ScriptProcessorNode, ev: AudioProcessingEvent) => any;
+    addEventListener<K extends keyof ScriptProcessorNodeEventMap>(type: K, listener: (this: ScriptProcessorNode, ev: ScriptProcessorNodeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11521,6 +10551,7 @@ declare var SubtleCrypto: {
 
 interface Text extends CharacterData {
     readonly wholeText: string;
+    readonly assignedSlot: HTMLSlotElement | null;
     splitText(offset: number): Text;
 }
 
@@ -11570,6 +10601,12 @@ declare var TextMetrics: {
     new(): TextMetrics;
 }
 
+interface TextTrackEventMap {
+    "cuechange": Event;
+    "error": ErrorEvent;
+    "load": Event;
+}
+
 interface TextTrack extends EventTarget {
     readonly activeCues: TextTrackCueList;
     readonly cues: TextTrackCueList;
@@ -11578,9 +10615,9 @@ interface TextTrack extends EventTarget {
     readonly label: string;
     readonly language: string;
     mode: any;
-    oncuechange: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
+    oncuechange: (this: TextTrack, ev: Event) => any;
+    onerror: (this: TextTrack, ev: ErrorEvent) => any;
+    onload: (this: TextTrack, ev: Event) => any;
     readonly readyState: number;
     addCue(cue: TextTrackCue): void;
     removeCue(cue: TextTrackCue): void;
@@ -11591,9 +10628,7 @@ interface TextTrack extends EventTarget {
     readonly LOADING: number;
     readonly NONE: number;
     readonly SHOWING: number;
-    addEventListener(type: "cuechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackEventMap>(type: K, listener: (this: TextTrack, ev: TextTrackEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11609,18 +10644,22 @@ declare var TextTrack: {
     readonly SHOWING: number;
 }
 
+interface TextTrackCueEventMap {
+    "enter": Event;
+    "exit": Event;
+}
+
 interface TextTrackCue extends EventTarget {
     endTime: number;
     id: string;
-    onenter: (this: this, ev: Event) => any;
-    onexit: (this: this, ev: Event) => any;
+    onenter: (this: TextTrackCue, ev: Event) => any;
+    onexit: (this: TextTrackCue, ev: Event) => any;
     pauseOnExit: boolean;
     startTime: number;
     text: string;
     readonly track: TextTrack;
     getCueAsHTML(): DocumentFragment;
-    addEventListener(type: "enter", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "exit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -11641,11 +10680,15 @@ declare var TextTrackCueList: {
     new(): TextTrackCueList;
 }
 
+interface TextTrackListEventMap {
+    "addtrack": TrackEvent;
+}
+
 interface TextTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: ((this: this, ev: TrackEvent) => any) | null;
+    onaddtrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
     item(index: number): TextTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: TextTrack;
 }
@@ -11835,17 +10878,21 @@ declare var VideoTrack: {
     new(): VideoTrack;
 }
 
+interface VideoTrackListEventMap {
+    "addtrack": TrackEvent;
+    "change": Event;
+    "removetrack": TrackEvent;
+}
+
 interface VideoTrackList extends EventTarget {
     readonly length: number;
-    onaddtrack: (this: this, ev: TrackEvent) => any;
-    onchange: (this: this, ev: Event) => any;
-    onremovetrack: (this: this, ev: TrackEvent) => any;
+    onaddtrack: (this: VideoTrackList, ev: TrackEvent) => any;
+    onchange: (this: VideoTrackList, ev: Event) => any;
+    onremovetrack: (this: VideoTrackList, ev: TrackEvent) => any;
     readonly selectedIndex: number;
     getTrackById(id: string): VideoTrack | null;
     item(index: number): VideoTrack;
-    addEventListener(type: "addtrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "removetrack", listener: (this: this, ev: TrackEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof VideoTrackListEventMap>(type: K, listener: (this: VideoTrackList, ev: VideoTrackListEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
     [index: number]: VideoTrack;
 }
@@ -12791,14 +11838,21 @@ declare var WebKitPoint: {
     new(x?: number, y?: number): WebKitPoint;
 }
 
+interface WebSocketEventMap {
+    "close": CloseEvent;
+    "error": ErrorEvent;
+    "message": MessageEvent;
+    "open": Event;
+}
+
 interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: this, ev: CloseEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onopen: (this: this, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent) => any;
+    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent) => any;
+    onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -12808,10 +11862,7 @@ interface WebSocket extends EventTarget {
     readonly CLOSING: number;
     readonly CONNECTING: number;
     readonly OPEN: number;
-    addEventListener(type: "close", listener: (this: this, ev: CloseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "open", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -12847,6 +11898,95 @@ declare var WheelEvent: {
     readonly DOM_DELTA_PIXEL: number;
 }
 
+interface WindowEventMap extends GlobalEventHandlersEventMap {
+    "abort": UIEvent;
+    "afterprint": Event;
+    "beforeprint": Event;
+    "beforeunload": BeforeUnloadEvent;
+    "blur": FocusEvent;
+    "canplay": Event;
+    "canplaythrough": Event;
+    "change": Event;
+    "click": MouseEvent;
+    "compassneedscalibration": Event;
+    "contextmenu": PointerEvent;
+    "dblclick": MouseEvent;
+    "devicelight": DeviceLightEvent;
+    "devicemotion": DeviceMotionEvent;
+    "deviceorientation": DeviceOrientationEvent;
+    "drag": DragEvent;
+    "dragend": DragEvent;
+    "dragenter": DragEvent;
+    "dragleave": DragEvent;
+    "dragover": DragEvent;
+    "dragstart": DragEvent;
+    "drop": DragEvent;
+    "durationchange": Event;
+    "emptied": Event;
+    "ended": MediaStreamErrorEvent;
+    "focus": FocusEvent;
+    "hashchange": HashChangeEvent;
+    "input": Event;
+    "invalid": Event;
+    "keydown": KeyboardEvent;
+    "keypress": KeyboardEvent;
+    "keyup": KeyboardEvent;
+    "load": Event;
+    "loadeddata": Event;
+    "loadedmetadata": Event;
+    "loadstart": Event;
+    "message": MessageEvent;
+    "mousedown": MouseEvent;
+    "mouseenter": MouseEvent;
+    "mouseleave": MouseEvent;
+    "mousemove": MouseEvent;
+    "mouseout": MouseEvent;
+    "mouseover": MouseEvent;
+    "mouseup": MouseEvent;
+    "mousewheel": WheelEvent;
+    "MSGestureChange": MSGestureEvent;
+    "MSGestureDoubleTap": MSGestureEvent;
+    "MSGestureEnd": MSGestureEvent;
+    "MSGestureHold": MSGestureEvent;
+    "MSGestureStart": MSGestureEvent;
+    "MSGestureTap": MSGestureEvent;
+    "MSInertiaStart": MSGestureEvent;
+    "MSPointerCancel": MSPointerEvent;
+    "MSPointerDown": MSPointerEvent;
+    "MSPointerEnter": MSPointerEvent;
+    "MSPointerLeave": MSPointerEvent;
+    "MSPointerMove": MSPointerEvent;
+    "MSPointerOut": MSPointerEvent;
+    "MSPointerOver": MSPointerEvent;
+    "MSPointerUp": MSPointerEvent;
+    "offline": Event;
+    "online": Event;
+    "orientationchange": Event;
+    "pagehide": PageTransitionEvent;
+    "pageshow": PageTransitionEvent;
+    "pause": Event;
+    "play": Event;
+    "playing": Event;
+    "popstate": PopStateEvent;
+    "progress": ProgressEvent;
+    "ratechange": Event;
+    "readystatechange": ProgressEvent;
+    "reset": Event;
+    "resize": UIEvent;
+    "scroll": UIEvent;
+    "seeked": Event;
+    "seeking": Event;
+    "select": UIEvent;
+    "stalled": Event;
+    "storage": StorageEvent;
+    "submit": Event;
+    "suspend": Event;
+    "timeupdate": Event;
+    "unload": Event;
+    "volumechange": Event;
+    "waiting": Event;
+}
+
 interface Window extends EventTarget, WindowTimers, WindowSessionStorage, WindowLocalStorage, WindowConsole, GlobalEventHandlers, IDBEnvironment, WindowBase64 {
     readonly applicationCache: ApplicationCache;
     readonly clientInformation: Navigator;
@@ -12871,97 +12011,97 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     name: string;
     readonly navigator: Navigator;
     offscreenBuffering: string | boolean;
-    onabort: (this: this, ev: UIEvent) => any;
-    onafterprint: (this: this, ev: Event) => any;
-    onbeforeprint: (this: this, ev: Event) => any;
-    onbeforeunload: (this: this, ev: BeforeUnloadEvent) => any;
-    onblur: (this: this, ev: FocusEvent) => any;
-    oncanplay: (this: this, ev: Event) => any;
-    oncanplaythrough: (this: this, ev: Event) => any;
-    onchange: (this: this, ev: Event) => any;
-    onclick: (this: this, ev: MouseEvent) => any;
-    oncompassneedscalibration: (this: this, ev: Event) => any;
-    oncontextmenu: (this: this, ev: PointerEvent) => any;
-    ondblclick: (this: this, ev: MouseEvent) => any;
-    ondevicelight: (this: this, ev: DeviceLightEvent) => any;
-    ondevicemotion: (this: this, ev: DeviceMotionEvent) => any;
-    ondeviceorientation: (this: this, ev: DeviceOrientationEvent) => any;
-    ondrag: (this: this, ev: DragEvent) => any;
-    ondragend: (this: this, ev: DragEvent) => any;
-    ondragenter: (this: this, ev: DragEvent) => any;
-    ondragleave: (this: this, ev: DragEvent) => any;
-    ondragover: (this: this, ev: DragEvent) => any;
-    ondragstart: (this: this, ev: DragEvent) => any;
-    ondrop: (this: this, ev: DragEvent) => any;
-    ondurationchange: (this: this, ev: Event) => any;
-    onemptied: (this: this, ev: Event) => any;
-    onended: (this: this, ev: MediaStreamErrorEvent) => any;
+    onabort: (this: Window, ev: UIEvent) => any;
+    onafterprint: (this: Window, ev: Event) => any;
+    onbeforeprint: (this: Window, ev: Event) => any;
+    onbeforeunload: (this: Window, ev: BeforeUnloadEvent) => any;
+    onblur: (this: Window, ev: FocusEvent) => any;
+    oncanplay: (this: Window, ev: Event) => any;
+    oncanplaythrough: (this: Window, ev: Event) => any;
+    onchange: (this: Window, ev: Event) => any;
+    onclick: (this: Window, ev: MouseEvent) => any;
+    oncompassneedscalibration: (this: Window, ev: Event) => any;
+    oncontextmenu: (this: Window, ev: PointerEvent) => any;
+    ondblclick: (this: Window, ev: MouseEvent) => any;
+    ondevicelight: (this: Window, ev: DeviceLightEvent) => any;
+    ondevicemotion: (this: Window, ev: DeviceMotionEvent) => any;
+    ondeviceorientation: (this: Window, ev: DeviceOrientationEvent) => any;
+    ondrag: (this: Window, ev: DragEvent) => any;
+    ondragend: (this: Window, ev: DragEvent) => any;
+    ondragenter: (this: Window, ev: DragEvent) => any;
+    ondragleave: (this: Window, ev: DragEvent) => any;
+    ondragover: (this: Window, ev: DragEvent) => any;
+    ondragstart: (this: Window, ev: DragEvent) => any;
+    ondrop: (this: Window, ev: DragEvent) => any;
+    ondurationchange: (this: Window, ev: Event) => any;
+    onemptied: (this: Window, ev: Event) => any;
+    onended: (this: Window, ev: MediaStreamErrorEvent) => any;
     onerror: ErrorEventHandler;
-    onfocus: (this: this, ev: FocusEvent) => any;
-    onhashchange: (this: this, ev: HashChangeEvent) => any;
-    oninput: (this: this, ev: Event) => any;
-    oninvalid: (this: this, ev: Event) => any;
-    onkeydown: (this: this, ev: KeyboardEvent) => any;
-    onkeypress: (this: this, ev: KeyboardEvent) => any;
-    onkeyup: (this: this, ev: KeyboardEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadeddata: (this: this, ev: Event) => any;
-    onloadedmetadata: (this: this, ev: Event) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onmousedown: (this: this, ev: MouseEvent) => any;
-    onmouseenter: (this: this, ev: MouseEvent) => any;
-    onmouseleave: (this: this, ev: MouseEvent) => any;
-    onmousemove: (this: this, ev: MouseEvent) => any;
-    onmouseout: (this: this, ev: MouseEvent) => any;
-    onmouseover: (this: this, ev: MouseEvent) => any;
-    onmouseup: (this: this, ev: MouseEvent) => any;
-    onmousewheel: (this: this, ev: WheelEvent) => any;
-    onmsgesturechange: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturedoubletap: (this: this, ev: MSGestureEvent) => any;
-    onmsgestureend: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturehold: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturestart: (this: this, ev: MSGestureEvent) => any;
-    onmsgesturetap: (this: this, ev: MSGestureEvent) => any;
-    onmsinertiastart: (this: this, ev: MSGestureEvent) => any;
-    onmspointercancel: (this: this, ev: MSPointerEvent) => any;
-    onmspointerdown: (this: this, ev: MSPointerEvent) => any;
-    onmspointerenter: (this: this, ev: MSPointerEvent) => any;
-    onmspointerleave: (this: this, ev: MSPointerEvent) => any;
-    onmspointermove: (this: this, ev: MSPointerEvent) => any;
-    onmspointerout: (this: this, ev: MSPointerEvent) => any;
-    onmspointerover: (this: this, ev: MSPointerEvent) => any;
-    onmspointerup: (this: this, ev: MSPointerEvent) => any;
-    onoffline: (this: this, ev: Event) => any;
-    ononline: (this: this, ev: Event) => any;
-    onorientationchange: (this: this, ev: Event) => any;
-    onpagehide: (this: this, ev: PageTransitionEvent) => any;
-    onpageshow: (this: this, ev: PageTransitionEvent) => any;
-    onpause: (this: this, ev: Event) => any;
-    onplay: (this: this, ev: Event) => any;
-    onplaying: (this: this, ev: Event) => any;
-    onpopstate: (this: this, ev: PopStateEvent) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    onratechange: (this: this, ev: Event) => any;
-    onreadystatechange: (this: this, ev: ProgressEvent) => any;
-    onreset: (this: this, ev: Event) => any;
-    onresize: (this: this, ev: UIEvent) => any;
-    onscroll: (this: this, ev: UIEvent) => any;
-    onseeked: (this: this, ev: Event) => any;
-    onseeking: (this: this, ev: Event) => any;
-    onselect: (this: this, ev: UIEvent) => any;
-    onstalled: (this: this, ev: Event) => any;
-    onstorage: (this: this, ev: StorageEvent) => any;
-    onsubmit: (this: this, ev: Event) => any;
-    onsuspend: (this: this, ev: Event) => any;
-    ontimeupdate: (this: this, ev: Event) => any;
+    onfocus: (this: Window, ev: FocusEvent) => any;
+    onhashchange: (this: Window, ev: HashChangeEvent) => any;
+    oninput: (this: Window, ev: Event) => any;
+    oninvalid: (this: Window, ev: Event) => any;
+    onkeydown: (this: Window, ev: KeyboardEvent) => any;
+    onkeypress: (this: Window, ev: KeyboardEvent) => any;
+    onkeyup: (this: Window, ev: KeyboardEvent) => any;
+    onload: (this: Window, ev: Event) => any;
+    onloadeddata: (this: Window, ev: Event) => any;
+    onloadedmetadata: (this: Window, ev: Event) => any;
+    onloadstart: (this: Window, ev: Event) => any;
+    onmessage: (this: Window, ev: MessageEvent) => any;
+    onmousedown: (this: Window, ev: MouseEvent) => any;
+    onmouseenter: (this: Window, ev: MouseEvent) => any;
+    onmouseleave: (this: Window, ev: MouseEvent) => any;
+    onmousemove: (this: Window, ev: MouseEvent) => any;
+    onmouseout: (this: Window, ev: MouseEvent) => any;
+    onmouseover: (this: Window, ev: MouseEvent) => any;
+    onmouseup: (this: Window, ev: MouseEvent) => any;
+    onmousewheel: (this: Window, ev: WheelEvent) => any;
+    onmsgesturechange: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturedoubletap: (this: Window, ev: MSGestureEvent) => any;
+    onmsgestureend: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturehold: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturestart: (this: Window, ev: MSGestureEvent) => any;
+    onmsgesturetap: (this: Window, ev: MSGestureEvent) => any;
+    onmsinertiastart: (this: Window, ev: MSGestureEvent) => any;
+    onmspointercancel: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerdown: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerenter: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerleave: (this: Window, ev: MSPointerEvent) => any;
+    onmspointermove: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerout: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerover: (this: Window, ev: MSPointerEvent) => any;
+    onmspointerup: (this: Window, ev: MSPointerEvent) => any;
+    onoffline: (this: Window, ev: Event) => any;
+    ononline: (this: Window, ev: Event) => any;
+    onorientationchange: (this: Window, ev: Event) => any;
+    onpagehide: (this: Window, ev: PageTransitionEvent) => any;
+    onpageshow: (this: Window, ev: PageTransitionEvent) => any;
+    onpause: (this: Window, ev: Event) => any;
+    onplay: (this: Window, ev: Event) => any;
+    onplaying: (this: Window, ev: Event) => any;
+    onpopstate: (this: Window, ev: PopStateEvent) => any;
+    onprogress: (this: Window, ev: ProgressEvent) => any;
+    onratechange: (this: Window, ev: Event) => any;
+    onreadystatechange: (this: Window, ev: ProgressEvent) => any;
+    onreset: (this: Window, ev: Event) => any;
+    onresize: (this: Window, ev: UIEvent) => any;
+    onscroll: (this: Window, ev: UIEvent) => any;
+    onseeked: (this: Window, ev: Event) => any;
+    onseeking: (this: Window, ev: Event) => any;
+    onselect: (this: Window, ev: UIEvent) => any;
+    onstalled: (this: Window, ev: Event) => any;
+    onstorage: (this: Window, ev: StorageEvent) => any;
+    onsubmit: (this: Window, ev: Event) => any;
+    onsuspend: (this: Window, ev: Event) => any;
+    ontimeupdate: (this: Window, ev: Event) => any;
     ontouchcancel: (ev: TouchEvent) => any;
     ontouchend: (ev: TouchEvent) => any;
     ontouchmove: (ev: TouchEvent) => any;
     ontouchstart: (ev: TouchEvent) => any;
-    onunload: (this: this, ev: Event) => any;
-    onvolumechange: (this: this, ev: Event) => any;
-    onwaiting: (this: this, ev: Event) => any;
+    onunload: (this: Window, ev: Event) => any;
+    onvolumechange: (this: Window, ev: Event) => any;
+    onwaiting: (this: Window, ev: Event) => any;
     opener: any;
     orientation: string | number;
     readonly outerHeight: number;
@@ -13020,101 +12160,7 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
     scroll(options?: ScrollToOptions): void;
     scrollTo(options?: ScrollToOptions): void;
     scrollBy(options?: ScrollToOptions): void;
-    addEventListener(type: "MSGestureChange", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureDoubleTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureEnd", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureHold", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSGestureTap", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSInertiaStart", listener: (this: this, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerCancel", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerDown", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerEnter", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerLeave", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerMove", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOut", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerOver", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "MSPointerUp", listener: (this: this, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "abort", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "afterprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeprint", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "beforeunload", listener: (this: this, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "blur", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplay", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "canplaythrough", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "change", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "click", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "compassneedscalibration", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "contextmenu", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dblclick", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "devicelight", listener: (this: this, ev: DeviceLightEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "devicemotion", listener: (this: this, ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "deviceorientation", listener: (this: this, ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drag", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragend", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragenter", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragleave", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragover", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "dragstart", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "drop", listener: (this: this, ev: DragEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "durationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "emptied", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "ended", listener: (this: this, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "focus", listener: (this: this, ev: FocusEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "hashchange", listener: (this: this, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "input", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "invalid", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "keydown", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keypress", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "keyup", listener: (this: this, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadeddata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadedmetadata", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousedown", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseenter", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseleave", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousemove", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseout", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseover", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mouseup", listener: (this: this, ev: MouseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "mousewheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "offline", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "online", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "orientationchange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pagehide", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pageshow", listener: (this: this, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pause", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "play", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "playing", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "popstate", listener: (this: this, ev: PopStateEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "ratechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "reset", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "resize", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "scroll", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "seeking", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "select", listener: (this: this, ev: UIEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "stalled", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "storage", listener: (this: this, ev: StorageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "submit", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "suspend", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeupdate", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "unload", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "volumechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "waiting", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13123,12 +12169,15 @@ declare var Window: {
     new(): Window;
 }
 
+interface WorkerEventMap extends AbstractWorkerEventMap {
+    "message": MessageEvent;
+}
+
 interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: Worker, ev: MessageEvent) => any;
     postMessage(message: any, ports?: any): void;
     terminate(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13138,6 +12187,8 @@ declare var Worker: {
 }
 
 interface XMLDocument extends Document {
+    addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, useCapture?: boolean): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var XMLDocument: {
@@ -13145,8 +12196,12 @@ declare var XMLDocument: {
     new(): XMLDocument;
 }
 
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+    "readystatechange": Event;
+}
+
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: this, ev: Event) => any;
+    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -13174,14 +12229,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    addEventListener(type: "abort", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13197,6 +12245,7 @@ declare var XMLHttpRequest: {
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13217,7 +12266,7 @@ declare var XMLSerializer: {
 interface XPathEvaluator {
     createExpression(expression: string, resolver: XPathNSResolver): XPathExpression;
     createNSResolver(nodeResolver?: Node): XPathNSResolver;
-    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver, type: number, result: XPathResult): XPathResult;
+    evaluate(expression: string, contextNode: Node, resolver: XPathNSResolver | null, type: number, result: XPathResult | null): XPathResult;
 }
 
 declare var XPathEvaluator: {
@@ -13226,7 +12275,7 @@ declare var XPathEvaluator: {
 }
 
 interface XPathExpression {
-    evaluate(contextNode: Node, type: number, result: XPathResult): XPathExpression;
+    evaluate(contextNode: Node, type: number, result: XPathResult | null): XPathResult;
 }
 
 declare var XPathExpression: {
@@ -13296,9 +12345,13 @@ declare var XSLTProcessor: {
     new(): XSLTProcessor;
 }
 
+interface AbstractWorkerEventMap {
+    "error": ErrorEvent;
+}
+
 interface AbstractWorker {
-    onerror: (this: this, ev: ErrorEvent) => any;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13409,25 +12462,29 @@ interface GetSVGDocument {
     getSVGDocument(): Document;
 }
 
+interface GlobalEventHandlersEventMap {
+    "pointercancel": PointerEvent;
+    "pointerdown": PointerEvent;
+    "pointerenter": PointerEvent;
+    "pointerleave": PointerEvent;
+    "pointermove": PointerEvent;
+    "pointerout": PointerEvent;
+    "pointerover": PointerEvent;
+    "pointerup": PointerEvent;
+    "wheel": WheelEvent;
+}
+
 interface GlobalEventHandlers {
-    onpointercancel: (this: this, ev: PointerEvent) => any;
-    onpointerdown: (this: this, ev: PointerEvent) => any;
-    onpointerenter: (this: this, ev: PointerEvent) => any;
-    onpointerleave: (this: this, ev: PointerEvent) => any;
-    onpointermove: (this: this, ev: PointerEvent) => any;
-    onpointerout: (this: this, ev: PointerEvent) => any;
-    onpointerover: (this: this, ev: PointerEvent) => any;
-    onpointerup: (this: this, ev: PointerEvent) => any;
-    onwheel: (this: this, ev: WheelEvent) => any;
-    addEventListener(type: "pointercancel", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerdown", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerenter", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerleave", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointermove", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerout", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerover", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "pointerup", listener: (this: this, ev: PointerEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "wheel", listener: (this: this, ev: WheelEvent) => any, useCapture?: boolean): void;
+    onpointercancel: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerdown: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerenter: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerleave: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointermove: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerout: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerover: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onpointerup: (this: GlobalEventHandlers, ev: PointerEvent) => any;
+    onwheel: (this: GlobalEventHandlers, ev: WheelEvent) => any;
+    addEventListener<K extends keyof GlobalEventHandlersEventMap>(type: K, listener: (this: GlobalEventHandlers, ev: GlobalEventHandlersEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13454,25 +12511,29 @@ interface LinkStyle {
     readonly sheet: StyleSheet;
 }
 
+interface MSBaseReaderEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+}
+
 interface MSBaseReader {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onabort: (this: MSBaseReader, ev: Event) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
+    onload: (this: MSBaseReader, ev: Event) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
+    onloadstart: (this: MSBaseReader, ev: Event) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -13521,359 +12582,9 @@ interface NavigatorUserMedia {
 }
 
 interface NodeSelector {
-    querySelector(selectors: "a"): HTMLAnchorElement | null;
-    querySelector(selectors: "abbr"): HTMLElement | null;
-    querySelector(selectors: "acronym"): HTMLElement | null;
-    querySelector(selectors: "address"): HTMLElement | null;
-    querySelector(selectors: "applet"): HTMLAppletElement | null;
-    querySelector(selectors: "area"): HTMLAreaElement | null;
-    querySelector(selectors: "article"): HTMLElement | null;
-    querySelector(selectors: "aside"): HTMLElement | null;
-    querySelector(selectors: "audio"): HTMLAudioElement | null;
-    querySelector(selectors: "b"): HTMLElement | null;
-    querySelector(selectors: "base"): HTMLBaseElement | null;
-    querySelector(selectors: "basefont"): HTMLBaseFontElement | null;
-    querySelector(selectors: "bdo"): HTMLElement | null;
-    querySelector(selectors: "big"): HTMLElement | null;
-    querySelector(selectors: "blockquote"): HTMLQuoteElement | null;
-    querySelector(selectors: "body"): HTMLBodyElement | null;
-    querySelector(selectors: "br"): HTMLBRElement | null;
-    querySelector(selectors: "button"): HTMLButtonElement | null;
-    querySelector(selectors: "canvas"): HTMLCanvasElement | null;
-    querySelector(selectors: "caption"): HTMLTableCaptionElement | null;
-    querySelector(selectors: "center"): HTMLElement | null;
-    querySelector(selectors: "circle"): SVGCircleElement | null;
-    querySelector(selectors: "cite"): HTMLElement | null;
-    querySelector(selectors: "clippath"): SVGClipPathElement | null;
-    querySelector(selectors: "code"): HTMLElement | null;
-    querySelector(selectors: "col"): HTMLTableColElement | null;
-    querySelector(selectors: "colgroup"): HTMLTableColElement | null;
-    querySelector(selectors: "datalist"): HTMLDataListElement | null;
-    querySelector(selectors: "dd"): HTMLElement | null;
-    querySelector(selectors: "defs"): SVGDefsElement | null;
-    querySelector(selectors: "del"): HTMLModElement | null;
-    querySelector(selectors: "desc"): SVGDescElement | null;
-    querySelector(selectors: "dfn"): HTMLElement | null;
-    querySelector(selectors: "dir"): HTMLDirectoryElement | null;
-    querySelector(selectors: "div"): HTMLDivElement | null;
-    querySelector(selectors: "dl"): HTMLDListElement | null;
-    querySelector(selectors: "dt"): HTMLElement | null;
-    querySelector(selectors: "ellipse"): SVGEllipseElement | null;
-    querySelector(selectors: "em"): HTMLElement | null;
-    querySelector(selectors: "embed"): HTMLEmbedElement | null;
-    querySelector(selectors: "feblend"): SVGFEBlendElement | null;
-    querySelector(selectors: "fecolormatrix"): SVGFEColorMatrixElement | null;
-    querySelector(selectors: "fecomponenttransfer"): SVGFEComponentTransferElement | null;
-    querySelector(selectors: "fecomposite"): SVGFECompositeElement | null;
-    querySelector(selectors: "feconvolvematrix"): SVGFEConvolveMatrixElement | null;
-    querySelector(selectors: "fediffuselighting"): SVGFEDiffuseLightingElement | null;
-    querySelector(selectors: "fedisplacementmap"): SVGFEDisplacementMapElement | null;
-    querySelector(selectors: "fedistantlight"): SVGFEDistantLightElement | null;
-    querySelector(selectors: "feflood"): SVGFEFloodElement | null;
-    querySelector(selectors: "fefunca"): SVGFEFuncAElement | null;
-    querySelector(selectors: "fefuncb"): SVGFEFuncBElement | null;
-    querySelector(selectors: "fefuncg"): SVGFEFuncGElement | null;
-    querySelector(selectors: "fefuncr"): SVGFEFuncRElement | null;
-    querySelector(selectors: "fegaussianblur"): SVGFEGaussianBlurElement | null;
-    querySelector(selectors: "feimage"): SVGFEImageElement | null;
-    querySelector(selectors: "femerge"): SVGFEMergeElement | null;
-    querySelector(selectors: "femergenode"): SVGFEMergeNodeElement | null;
-    querySelector(selectors: "femorphology"): SVGFEMorphologyElement | null;
-    querySelector(selectors: "feoffset"): SVGFEOffsetElement | null;
-    querySelector(selectors: "fepointlight"): SVGFEPointLightElement | null;
-    querySelector(selectors: "fespecularlighting"): SVGFESpecularLightingElement | null;
-    querySelector(selectors: "fespotlight"): SVGFESpotLightElement | null;
-    querySelector(selectors: "fetile"): SVGFETileElement | null;
-    querySelector(selectors: "feturbulence"): SVGFETurbulenceElement | null;
-    querySelector(selectors: "fieldset"): HTMLFieldSetElement | null;
-    querySelector(selectors: "figcaption"): HTMLElement | null;
-    querySelector(selectors: "figure"): HTMLElement | null;
-    querySelector(selectors: "filter"): SVGFilterElement | null;
-    querySelector(selectors: "font"): HTMLFontElement | null;
-    querySelector(selectors: "footer"): HTMLElement | null;
-    querySelector(selectors: "foreignobject"): SVGForeignObjectElement | null;
-    querySelector(selectors: "form"): HTMLFormElement | null;
-    querySelector(selectors: "frame"): HTMLFrameElement | null;
-    querySelector(selectors: "frameset"): HTMLFrameSetElement | null;
-    querySelector(selectors: "g"): SVGGElement | null;
-    querySelector(selectors: "h1"): HTMLHeadingElement | null;
-    querySelector(selectors: "h2"): HTMLHeadingElement | null;
-    querySelector(selectors: "h3"): HTMLHeadingElement | null;
-    querySelector(selectors: "h4"): HTMLHeadingElement | null;
-    querySelector(selectors: "h5"): HTMLHeadingElement | null;
-    querySelector(selectors: "h6"): HTMLHeadingElement | null;
-    querySelector(selectors: "head"): HTMLHeadElement | null;
-    querySelector(selectors: "header"): HTMLElement | null;
-    querySelector(selectors: "hgroup"): HTMLElement | null;
-    querySelector(selectors: "hr"): HTMLHRElement | null;
-    querySelector(selectors: "html"): HTMLHtmlElement | null;
-    querySelector(selectors: "i"): HTMLElement | null;
-    querySelector(selectors: "iframe"): HTMLIFrameElement | null;
-    querySelector(selectors: "image"): SVGImageElement | null;
-    querySelector(selectors: "img"): HTMLImageElement | null;
-    querySelector(selectors: "input"): HTMLInputElement | null;
-    querySelector(selectors: "ins"): HTMLModElement | null;
-    querySelector(selectors: "isindex"): HTMLUnknownElement | null;
-    querySelector(selectors: "kbd"): HTMLElement | null;
-    querySelector(selectors: "keygen"): HTMLElement | null;
-    querySelector(selectors: "label"): HTMLLabelElement | null;
-    querySelector(selectors: "legend"): HTMLLegendElement | null;
-    querySelector(selectors: "li"): HTMLLIElement | null;
-    querySelector(selectors: "line"): SVGLineElement | null;
-    querySelector(selectors: "lineargradient"): SVGLinearGradientElement | null;
-    querySelector(selectors: "link"): HTMLLinkElement | null;
-    querySelector(selectors: "listing"): HTMLPreElement | null;
-    querySelector(selectors: "map"): HTMLMapElement | null;
-    querySelector(selectors: "mark"): HTMLElement | null;
-    querySelector(selectors: "marker"): SVGMarkerElement | null;
-    querySelector(selectors: "marquee"): HTMLMarqueeElement | null;
-    querySelector(selectors: "mask"): SVGMaskElement | null;
-    querySelector(selectors: "menu"): HTMLMenuElement | null;
-    querySelector(selectors: "meta"): HTMLMetaElement | null;
-    querySelector(selectors: "metadata"): SVGMetadataElement | null;
-    querySelector(selectors: "meter"): HTMLMeterElement | null;
-    querySelector(selectors: "nav"): HTMLElement | null;
-    querySelector(selectors: "nextid"): HTMLUnknownElement | null;
-    querySelector(selectors: "nobr"): HTMLElement | null;
-    querySelector(selectors: "noframes"): HTMLElement | null;
-    querySelector(selectors: "noscript"): HTMLElement | null;
-    querySelector(selectors: "object"): HTMLObjectElement | null;
-    querySelector(selectors: "ol"): HTMLOListElement | null;
-    querySelector(selectors: "optgroup"): HTMLOptGroupElement | null;
-    querySelector(selectors: "option"): HTMLOptionElement | null;
-    querySelector(selectors: "p"): HTMLParagraphElement | null;
-    querySelector(selectors: "param"): HTMLParamElement | null;
-    querySelector(selectors: "path"): SVGPathElement | null;
-    querySelector(selectors: "pattern"): SVGPatternElement | null;
-    querySelector(selectors: "picture"): HTMLPictureElement | null;
-    querySelector(selectors: "plaintext"): HTMLElement | null;
-    querySelector(selectors: "polygon"): SVGPolygonElement | null;
-    querySelector(selectors: "polyline"): SVGPolylineElement | null;
-    querySelector(selectors: "pre"): HTMLPreElement | null;
-    querySelector(selectors: "progress"): HTMLProgressElement | null;
-    querySelector(selectors: "q"): HTMLQuoteElement | null;
-    querySelector(selectors: "radialgradient"): SVGRadialGradientElement | null;
-    querySelector(selectors: "rect"): SVGRectElement | null;
-    querySelector(selectors: "rt"): HTMLElement | null;
-    querySelector(selectors: "ruby"): HTMLElement | null;
-    querySelector(selectors: "s"): HTMLElement | null;
-    querySelector(selectors: "samp"): HTMLElement | null;
-    querySelector(selectors: "script"): HTMLScriptElement | null;
-    querySelector(selectors: "section"): HTMLElement | null;
-    querySelector(selectors: "select"): HTMLSelectElement | null;
-    querySelector(selectors: "small"): HTMLElement | null;
-    querySelector(selectors: "source"): HTMLSourceElement | null;
-    querySelector(selectors: "span"): HTMLSpanElement | null;
-    querySelector(selectors: "stop"): SVGStopElement | null;
-    querySelector(selectors: "strike"): HTMLElement | null;
-    querySelector(selectors: "strong"): HTMLElement | null;
-    querySelector(selectors: "style"): HTMLStyleElement | null;
-    querySelector(selectors: "sub"): HTMLElement | null;
-    querySelector(selectors: "sup"): HTMLElement | null;
-    querySelector(selectors: "svg"): SVGSVGElement | null;
-    querySelector(selectors: "switch"): SVGSwitchElement | null;
-    querySelector(selectors: "symbol"): SVGSymbolElement | null;
-    querySelector(selectors: "table"): HTMLTableElement | null;
-    querySelector(selectors: "tbody"): HTMLTableSectionElement | null;
-    querySelector(selectors: "td"): HTMLTableDataCellElement | null;
-    querySelector(selectors: "template"): HTMLTemplateElement | null;
-    querySelector(selectors: "text"): SVGTextElement | null;
-    querySelector(selectors: "textpath"): SVGTextPathElement | null;
-    querySelector(selectors: "textarea"): HTMLTextAreaElement | null;
-    querySelector(selectors: "tfoot"): HTMLTableSectionElement | null;
-    querySelector(selectors: "th"): HTMLTableHeaderCellElement | null;
-    querySelector(selectors: "thead"): HTMLTableSectionElement | null;
-    querySelector(selectors: "title"): HTMLTitleElement | null;
-    querySelector(selectors: "tr"): HTMLTableRowElement | null;
-    querySelector(selectors: "track"): HTMLTrackElement | null;
-    querySelector(selectors: "tspan"): SVGTSpanElement | null;
-    querySelector(selectors: "tt"): HTMLElement | null;
-    querySelector(selectors: "u"): HTMLElement | null;
-    querySelector(selectors: "ul"): HTMLUListElement | null;
-    querySelector(selectors: "use"): SVGUseElement | null;
-    querySelector(selectors: "var"): HTMLElement | null;
-    querySelector(selectors: "video"): HTMLVideoElement | null;
-    querySelector(selectors: "view"): SVGViewElement | null;
-    querySelector(selectors: "wbr"): HTMLElement | null;
-    querySelector(selectors: "x-ms-webview"): MSHTMLWebViewElement | null;
-    querySelector(selectors: "xmp"): HTMLPreElement | null;
+    querySelector<K extends keyof ElementTagNameMap>(selectors: K): ElementTagNameMap[K] | null;
     querySelector(selectors: string): Element | null;
-    querySelectorAll(selectors: "a"): NodeListOf<HTMLAnchorElement>;
-    querySelectorAll(selectors: "abbr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "acronym"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "address"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "applet"): NodeListOf<HTMLAppletElement>;
-    querySelectorAll(selectors: "area"): NodeListOf<HTMLAreaElement>;
-    querySelectorAll(selectors: "article"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "aside"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "audio"): NodeListOf<HTMLAudioElement>;
-    querySelectorAll(selectors: "b"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "base"): NodeListOf<HTMLBaseElement>;
-    querySelectorAll(selectors: "basefont"): NodeListOf<HTMLBaseFontElement>;
-    querySelectorAll(selectors: "bdo"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "big"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "blockquote"): NodeListOf<HTMLQuoteElement>;
-    querySelectorAll(selectors: "body"): NodeListOf<HTMLBodyElement>;
-    querySelectorAll(selectors: "br"): NodeListOf<HTMLBRElement>;
-    querySelectorAll(selectors: "button"): NodeListOf<HTMLButtonElement>;
-    querySelectorAll(selectors: "canvas"): NodeListOf<HTMLCanvasElement>;
-    querySelectorAll(selectors: "caption"): NodeListOf<HTMLTableCaptionElement>;
-    querySelectorAll(selectors: "center"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "circle"): NodeListOf<SVGCircleElement>;
-    querySelectorAll(selectors: "cite"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "clippath"): NodeListOf<SVGClipPathElement>;
-    querySelectorAll(selectors: "code"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "col"): NodeListOf<HTMLTableColElement>;
-    querySelectorAll(selectors: "colgroup"): NodeListOf<HTMLTableColElement>;
-    querySelectorAll(selectors: "datalist"): NodeListOf<HTMLDataListElement>;
-    querySelectorAll(selectors: "dd"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "defs"): NodeListOf<SVGDefsElement>;
-    querySelectorAll(selectors: "del"): NodeListOf<HTMLModElement>;
-    querySelectorAll(selectors: "desc"): NodeListOf<SVGDescElement>;
-    querySelectorAll(selectors: "dfn"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "dir"): NodeListOf<HTMLDirectoryElement>;
-    querySelectorAll(selectors: "div"): NodeListOf<HTMLDivElement>;
-    querySelectorAll(selectors: "dl"): NodeListOf<HTMLDListElement>;
-    querySelectorAll(selectors: "dt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ellipse"): NodeListOf<SVGEllipseElement>;
-    querySelectorAll(selectors: "em"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "embed"): NodeListOf<HTMLEmbedElement>;
-    querySelectorAll(selectors: "feblend"): NodeListOf<SVGFEBlendElement>;
-    querySelectorAll(selectors: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
-    querySelectorAll(selectors: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
-    querySelectorAll(selectors: "fecomposite"): NodeListOf<SVGFECompositeElement>;
-    querySelectorAll(selectors: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
-    querySelectorAll(selectors: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
-    querySelectorAll(selectors: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
-    querySelectorAll(selectors: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
-    querySelectorAll(selectors: "feflood"): NodeListOf<SVGFEFloodElement>;
-    querySelectorAll(selectors: "fefunca"): NodeListOf<SVGFEFuncAElement>;
-    querySelectorAll(selectors: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
-    querySelectorAll(selectors: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
-    querySelectorAll(selectors: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
-    querySelectorAll(selectors: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
-    querySelectorAll(selectors: "feimage"): NodeListOf<SVGFEImageElement>;
-    querySelectorAll(selectors: "femerge"): NodeListOf<SVGFEMergeElement>;
-    querySelectorAll(selectors: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
-    querySelectorAll(selectors: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
-    querySelectorAll(selectors: "feoffset"): NodeListOf<SVGFEOffsetElement>;
-    querySelectorAll(selectors: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
-    querySelectorAll(selectors: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
-    querySelectorAll(selectors: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
-    querySelectorAll(selectors: "fetile"): NodeListOf<SVGFETileElement>;
-    querySelectorAll(selectors: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
-    querySelectorAll(selectors: "fieldset"): NodeListOf<HTMLFieldSetElement>;
-    querySelectorAll(selectors: "figcaption"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "figure"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "filter"): NodeListOf<SVGFilterElement>;
-    querySelectorAll(selectors: "font"): NodeListOf<HTMLFontElement>;
-    querySelectorAll(selectors: "footer"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
-    querySelectorAll(selectors: "form"): NodeListOf<HTMLFormElement>;
-    querySelectorAll(selectors: "frame"): NodeListOf<HTMLFrameElement>;
-    querySelectorAll(selectors: "frameset"): NodeListOf<HTMLFrameSetElement>;
-    querySelectorAll(selectors: "g"): NodeListOf<SVGGElement>;
-    querySelectorAll(selectors: "h1"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h2"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h3"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h4"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h5"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "h6"): NodeListOf<HTMLHeadingElement>;
-    querySelectorAll(selectors: "head"): NodeListOf<HTMLHeadElement>;
-    querySelectorAll(selectors: "header"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "hgroup"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "hr"): NodeListOf<HTMLHRElement>;
-    querySelectorAll(selectors: "html"): NodeListOf<HTMLHtmlElement>;
-    querySelectorAll(selectors: "i"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "iframe"): NodeListOf<HTMLIFrameElement>;
-    querySelectorAll(selectors: "image"): NodeListOf<SVGImageElement>;
-    querySelectorAll(selectors: "img"): NodeListOf<HTMLImageElement>;
-    querySelectorAll(selectors: "input"): NodeListOf<HTMLInputElement>;
-    querySelectorAll(selectors: "ins"): NodeListOf<HTMLModElement>;
-    querySelectorAll(selectors: "isindex"): NodeListOf<HTMLUnknownElement>;
-    querySelectorAll(selectors: "kbd"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "keygen"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "label"): NodeListOf<HTMLLabelElement>;
-    querySelectorAll(selectors: "legend"): NodeListOf<HTMLLegendElement>;
-    querySelectorAll(selectors: "li"): NodeListOf<HTMLLIElement>;
-    querySelectorAll(selectors: "line"): NodeListOf<SVGLineElement>;
-    querySelectorAll(selectors: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
-    querySelectorAll(selectors: "link"): NodeListOf<HTMLLinkElement>;
-    querySelectorAll(selectors: "listing"): NodeListOf<HTMLPreElement>;
-    querySelectorAll(selectors: "map"): NodeListOf<HTMLMapElement>;
-    querySelectorAll(selectors: "mark"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "marker"): NodeListOf<SVGMarkerElement>;
-    querySelectorAll(selectors: "marquee"): NodeListOf<HTMLMarqueeElement>;
-    querySelectorAll(selectors: "mask"): NodeListOf<SVGMaskElement>;
-    querySelectorAll(selectors: "menu"): NodeListOf<HTMLMenuElement>;
-    querySelectorAll(selectors: "meta"): NodeListOf<HTMLMetaElement>;
-    querySelectorAll(selectors: "metadata"): NodeListOf<SVGMetadataElement>;
-    querySelectorAll(selectors: "meter"): NodeListOf<HTMLMeterElement>;
-    querySelectorAll(selectors: "nav"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "nextid"): NodeListOf<HTMLUnknownElement>;
-    querySelectorAll(selectors: "nobr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "noframes"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "noscript"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "object"): NodeListOf<HTMLObjectElement>;
-    querySelectorAll(selectors: "ol"): NodeListOf<HTMLOListElement>;
-    querySelectorAll(selectors: "optgroup"): NodeListOf<HTMLOptGroupElement>;
-    querySelectorAll(selectors: "option"): NodeListOf<HTMLOptionElement>;
-    querySelectorAll(selectors: "p"): NodeListOf<HTMLParagraphElement>;
-    querySelectorAll(selectors: "param"): NodeListOf<HTMLParamElement>;
-    querySelectorAll(selectors: "path"): NodeListOf<SVGPathElement>;
-    querySelectorAll(selectors: "pattern"): NodeListOf<SVGPatternElement>;
-    querySelectorAll(selectors: "picture"): NodeListOf<HTMLPictureElement>;
-    querySelectorAll(selectors: "plaintext"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "polygon"): NodeListOf<SVGPolygonElement>;
-    querySelectorAll(selectors: "polyline"): NodeListOf<SVGPolylineElement>;
-    querySelectorAll(selectors: "pre"): NodeListOf<HTMLPreElement>;
-    querySelectorAll(selectors: "progress"): NodeListOf<HTMLProgressElement>;
-    querySelectorAll(selectors: "q"): NodeListOf<HTMLQuoteElement>;
-    querySelectorAll(selectors: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
-    querySelectorAll(selectors: "rect"): NodeListOf<SVGRectElement>;
-    querySelectorAll(selectors: "rt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ruby"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "s"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "samp"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "script"): NodeListOf<HTMLScriptElement>;
-    querySelectorAll(selectors: "section"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "select"): NodeListOf<HTMLSelectElement>;
-    querySelectorAll(selectors: "small"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "source"): NodeListOf<HTMLSourceElement>;
-    querySelectorAll(selectors: "span"): NodeListOf<HTMLSpanElement>;
-    querySelectorAll(selectors: "stop"): NodeListOf<SVGStopElement>;
-    querySelectorAll(selectors: "strike"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "strong"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "style"): NodeListOf<HTMLStyleElement>;
-    querySelectorAll(selectors: "sub"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "sup"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "svg"): NodeListOf<SVGSVGElement>;
-    querySelectorAll(selectors: "switch"): NodeListOf<SVGSwitchElement>;
-    querySelectorAll(selectors: "symbol"): NodeListOf<SVGSymbolElement>;
-    querySelectorAll(selectors: "table"): NodeListOf<HTMLTableElement>;
-    querySelectorAll(selectors: "tbody"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "td"): NodeListOf<HTMLTableDataCellElement>;
-    querySelectorAll(selectors: "template"): NodeListOf<HTMLTemplateElement>;
-    querySelectorAll(selectors: "text"): NodeListOf<SVGTextElement>;
-    querySelectorAll(selectors: "textpath"): NodeListOf<SVGTextPathElement>;
-    querySelectorAll(selectors: "textarea"): NodeListOf<HTMLTextAreaElement>;
-    querySelectorAll(selectors: "tfoot"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "th"): NodeListOf<HTMLTableHeaderCellElement>;
-    querySelectorAll(selectors: "thead"): NodeListOf<HTMLTableSectionElement>;
-    querySelectorAll(selectors: "title"): NodeListOf<HTMLTitleElement>;
-    querySelectorAll(selectors: "tr"): NodeListOf<HTMLTableRowElement>;
-    querySelectorAll(selectors: "track"): NodeListOf<HTMLTrackElement>;
-    querySelectorAll(selectors: "tspan"): NodeListOf<SVGTSpanElement>;
-    querySelectorAll(selectors: "tt"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "u"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "ul"): NodeListOf<HTMLUListElement>;
-    querySelectorAll(selectors: "use"): NodeListOf<SVGUseElement>;
-    querySelectorAll(selectors: "var"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "video"): NodeListOf<HTMLVideoElement>;
-    querySelectorAll(selectors: "view"): NodeListOf<SVGViewElement>;
-    querySelectorAll(selectors: "wbr"): NodeListOf<HTMLElement>;
-    querySelectorAll(selectors: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
-    querySelectorAll(selectors: "xmp"): NodeListOf<HTMLPreElement>;
+    querySelectorAll<K extends keyof ElementListTagNameMap>(selectors: K): ElementListTagNameMap[K];
     querySelectorAll(selectors: string): NodeListOf<Element>;
 }
 
@@ -13973,21 +12684,25 @@ interface WindowTimersExtension {
     setImmediate(handler: any, ...args: any[]): number;
 }
 
+interface XMLHttpRequestEventTargetEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+    "timeout": ProgressEvent;
+}
+
 interface XMLHttpRequestEventTarget {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    ontimeout: (this: this, ev: ProgressEvent) => any;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -14247,6 +12962,33 @@ interface ParentNode {
     readonly childElementCount: number;
 }
 
+interface DocumentOrShadowRoot {
+    readonly activeElement: Element | null;
+    readonly stylesheets: StyleSheetList;
+    getSelection(): Selection | null;
+    elementFromPoint(x: number, y: number): Element | null;
+    elementsFromPoint(x: number, y: number): Element[];
+}
+
+interface ShadowRoot extends DocumentOrShadowRoot, DocumentFragment {
+    readonly host: Element;
+    innerHTML: string;
+}
+
+interface ShadowRootInit {
+    mode: 'open'|'closed';
+    delegatesFocus?: boolean;
+}
+
+interface HTMLSlotElement extends HTMLElement {
+    name: string;
+    assignedNodes(options?: AssignedNodesOptions): Node[];
+}
+
+interface AssignedNodesOptions {
+    flatten?: boolean;
+}
+
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
 interface ErrorEventHandler {
@@ -14294,6 +13036,447 @@ interface NavigatorUserMediaErrorCallback {
 interface ForEachCallback {
     (keyId: any, status: string): void;
 }
+interface HTMLElementTagNameMap {
+    "a": HTMLAnchorElement;
+    "applet": HTMLAppletElement;
+    "area": HTMLAreaElement;
+    "audio": HTMLAudioElement;
+    "base": HTMLBaseElement;
+    "basefont": HTMLBaseFontElement;
+    "blockquote": HTMLQuoteElement;
+    "body": HTMLBodyElement;
+    "br": HTMLBRElement;
+    "button": HTMLButtonElement;
+    "canvas": HTMLCanvasElement;
+    "caption": HTMLTableCaptionElement;
+    "col": HTMLTableColElement;
+    "colgroup": HTMLTableColElement;
+    "datalist": HTMLDataListElement;
+    "del": HTMLModElement;
+    "dir": HTMLDirectoryElement;
+    "div": HTMLDivElement;
+    "dl": HTMLDListElement;
+    "embed": HTMLEmbedElement;
+    "fieldset": HTMLFieldSetElement;
+    "font": HTMLFontElement;
+    "form": HTMLFormElement;
+    "frame": HTMLFrameElement;
+    "frameset": HTMLFrameSetElement;
+    "h1": HTMLHeadingElement;
+    "h2": HTMLHeadingElement;
+    "h3": HTMLHeadingElement;
+    "h4": HTMLHeadingElement;
+    "h5": HTMLHeadingElement;
+    "h6": HTMLHeadingElement;
+    "head": HTMLHeadElement;
+    "hr": HTMLHRElement;
+    "html": HTMLHtmlElement;
+    "iframe": HTMLIFrameElement;
+    "img": HTMLImageElement;
+    "input": HTMLInputElement;
+    "ins": HTMLModElement;
+    "isindex": HTMLUnknownElement;
+    "label": HTMLLabelElement;
+    "legend": HTMLLegendElement;
+    "li": HTMLLIElement;
+    "link": HTMLLinkElement;
+    "listing": HTMLPreElement;
+    "map": HTMLMapElement;
+    "marquee": HTMLMarqueeElement;
+    "menu": HTMLMenuElement;
+    "meta": HTMLMetaElement;
+    "meter": HTMLMeterElement;
+    "nextid": HTMLUnknownElement;
+    "object": HTMLObjectElement;
+    "ol": HTMLOListElement;
+    "optgroup": HTMLOptGroupElement;
+    "option": HTMLOptionElement;
+    "p": HTMLParagraphElement;
+    "param": HTMLParamElement;
+    "picture": HTMLPictureElement;
+    "pre": HTMLPreElement;
+    "progress": HTMLProgressElement;
+    "q": HTMLQuoteElement;
+    "script": HTMLScriptElement;
+    "select": HTMLSelectElement;
+    "source": HTMLSourceElement;
+    "span": HTMLSpanElement;
+    "style": HTMLStyleElement;
+    "table": HTMLTableElement;
+    "tbody": HTMLTableSectionElement;
+    "td": HTMLTableDataCellElement;
+    "template": HTMLTemplateElement;
+    "textarea": HTMLTextAreaElement;
+    "tfoot": HTMLTableSectionElement;
+    "th": HTMLTableHeaderCellElement;
+    "thead": HTMLTableSectionElement;
+    "title": HTMLTitleElement;
+    "tr": HTMLTableRowElement;
+    "track": HTMLTrackElement;
+    "ul": HTMLUListElement;
+    "video": HTMLVideoElement;
+    "x-ms-webview": MSHTMLWebViewElement;
+    "xmp": HTMLPreElement;
+}
+
+interface ElementTagNameMap {
+    "a": HTMLAnchorElement;
+    "abbr": HTMLElement;
+    "acronym": HTMLElement;
+    "address": HTMLElement;
+    "applet": HTMLAppletElement;
+    "area": HTMLAreaElement;
+    "article": HTMLElement;
+    "aside": HTMLElement;
+    "audio": HTMLAudioElement;
+    "b": HTMLElement;
+    "base": HTMLBaseElement;
+    "basefont": HTMLBaseFontElement;
+    "bdo": HTMLElement;
+    "big": HTMLElement;
+    "blockquote": HTMLQuoteElement;
+    "body": HTMLBodyElement;
+    "br": HTMLBRElement;
+    "button": HTMLButtonElement;
+    "canvas": HTMLCanvasElement;
+    "caption": HTMLTableCaptionElement;
+    "center": HTMLElement;
+    "circle": SVGCircleElement;
+    "cite": HTMLElement;
+    "clippath": SVGClipPathElement;
+    "code": HTMLElement;
+    "col": HTMLTableColElement;
+    "colgroup": HTMLTableColElement;
+    "datalist": HTMLDataListElement;
+    "dd": HTMLElement;
+    "defs": SVGDefsElement;
+    "del": HTMLModElement;
+    "desc": SVGDescElement;
+    "dfn": HTMLElement;
+    "dir": HTMLDirectoryElement;
+    "div": HTMLDivElement;
+    "dl": HTMLDListElement;
+    "dt": HTMLElement;
+    "ellipse": SVGEllipseElement;
+    "em": HTMLElement;
+    "embed": HTMLEmbedElement;
+    "feblend": SVGFEBlendElement;
+    "fecolormatrix": SVGFEColorMatrixElement;
+    "fecomponenttransfer": SVGFEComponentTransferElement;
+    "fecomposite": SVGFECompositeElement;
+    "feconvolvematrix": SVGFEConvolveMatrixElement;
+    "fediffuselighting": SVGFEDiffuseLightingElement;
+    "fedisplacementmap": SVGFEDisplacementMapElement;
+    "fedistantlight": SVGFEDistantLightElement;
+    "feflood": SVGFEFloodElement;
+    "fefunca": SVGFEFuncAElement;
+    "fefuncb": SVGFEFuncBElement;
+    "fefuncg": SVGFEFuncGElement;
+    "fefuncr": SVGFEFuncRElement;
+    "fegaussianblur": SVGFEGaussianBlurElement;
+    "feimage": SVGFEImageElement;
+    "femerge": SVGFEMergeElement;
+    "femergenode": SVGFEMergeNodeElement;
+    "femorphology": SVGFEMorphologyElement;
+    "feoffset": SVGFEOffsetElement;
+    "fepointlight": SVGFEPointLightElement;
+    "fespecularlighting": SVGFESpecularLightingElement;
+    "fespotlight": SVGFESpotLightElement;
+    "fetile": SVGFETileElement;
+    "feturbulence": SVGFETurbulenceElement;
+    "fieldset": HTMLFieldSetElement;
+    "figcaption": HTMLElement;
+    "figure": HTMLElement;
+    "filter": SVGFilterElement;
+    "font": HTMLFontElement;
+    "footer": HTMLElement;
+    "foreignobject": SVGForeignObjectElement;
+    "form": HTMLFormElement;
+    "frame": HTMLFrameElement;
+    "frameset": HTMLFrameSetElement;
+    "g": SVGGElement;
+    "h1": HTMLHeadingElement;
+    "h2": HTMLHeadingElement;
+    "h3": HTMLHeadingElement;
+    "h4": HTMLHeadingElement;
+    "h5": HTMLHeadingElement;
+    "h6": HTMLHeadingElement;
+    "head": HTMLHeadElement;
+    "header": HTMLElement;
+    "hgroup": HTMLElement;
+    "hr": HTMLHRElement;
+    "html": HTMLHtmlElement;
+    "i": HTMLElement;
+    "iframe": HTMLIFrameElement;
+    "image": SVGImageElement;
+    "img": HTMLImageElement;
+    "input": HTMLInputElement;
+    "ins": HTMLModElement;
+    "isindex": HTMLUnknownElement;
+    "kbd": HTMLElement;
+    "keygen": HTMLElement;
+    "label": HTMLLabelElement;
+    "legend": HTMLLegendElement;
+    "li": HTMLLIElement;
+    "line": SVGLineElement;
+    "lineargradient": SVGLinearGradientElement;
+    "link": HTMLLinkElement;
+    "listing": HTMLPreElement;
+    "map": HTMLMapElement;
+    "mark": HTMLElement;
+    "marker": SVGMarkerElement;
+    "marquee": HTMLMarqueeElement;
+    "mask": SVGMaskElement;
+    "menu": HTMLMenuElement;
+    "meta": HTMLMetaElement;
+    "metadata": SVGMetadataElement;
+    "meter": HTMLMeterElement;
+    "nav": HTMLElement;
+    "nextid": HTMLUnknownElement;
+    "nobr": HTMLElement;
+    "noframes": HTMLElement;
+    "noscript": HTMLElement;
+    "object": HTMLObjectElement;
+    "ol": HTMLOListElement;
+    "optgroup": HTMLOptGroupElement;
+    "option": HTMLOptionElement;
+    "p": HTMLParagraphElement;
+    "param": HTMLParamElement;
+    "path": SVGPathElement;
+    "pattern": SVGPatternElement;
+    "picture": HTMLPictureElement;
+    "plaintext": HTMLElement;
+    "polygon": SVGPolygonElement;
+    "polyline": SVGPolylineElement;
+    "pre": HTMLPreElement;
+    "progress": HTMLProgressElement;
+    "q": HTMLQuoteElement;
+    "radialgradient": SVGRadialGradientElement;
+    "rect": SVGRectElement;
+    "rt": HTMLElement;
+    "ruby": HTMLElement;
+    "s": HTMLElement;
+    "samp": HTMLElement;
+    "script": HTMLScriptElement;
+    "section": HTMLElement;
+    "select": HTMLSelectElement;
+    "small": HTMLElement;
+    "source": HTMLSourceElement;
+    "span": HTMLSpanElement;
+    "stop": SVGStopElement;
+    "strike": HTMLElement;
+    "strong": HTMLElement;
+    "style": HTMLStyleElement;
+    "sub": HTMLElement;
+    "sup": HTMLElement;
+    "svg": SVGSVGElement;
+    "switch": SVGSwitchElement;
+    "symbol": SVGSymbolElement;
+    "table": HTMLTableElement;
+    "tbody": HTMLTableSectionElement;
+    "td": HTMLTableDataCellElement;
+    "template": HTMLTemplateElement;
+    "text": SVGTextElement;
+    "textpath": SVGTextPathElement;
+    "textarea": HTMLTextAreaElement;
+    "tfoot": HTMLTableSectionElement;
+    "th": HTMLTableHeaderCellElement;
+    "thead": HTMLTableSectionElement;
+    "title": HTMLTitleElement;
+    "tr": HTMLTableRowElement;
+    "track": HTMLTrackElement;
+    "tspan": SVGTSpanElement;
+    "tt": HTMLElement;
+    "u": HTMLElement;
+    "ul": HTMLUListElement;
+    "use": SVGUseElement;
+    "var": HTMLElement;
+    "video": HTMLVideoElement;
+    "view": SVGViewElement;
+    "wbr": HTMLElement;
+    "x-ms-webview": MSHTMLWebViewElement;
+    "xmp": HTMLPreElement;
+}
+
+interface ElementListTagNameMap {
+    "a": NodeListOf<HTMLAnchorElement>;
+    "abbr": NodeListOf<HTMLElement>;
+    "acronym": NodeListOf<HTMLElement>;
+    "address": NodeListOf<HTMLElement>;
+    "applet": NodeListOf<HTMLAppletElement>;
+    "area": NodeListOf<HTMLAreaElement>;
+    "article": NodeListOf<HTMLElement>;
+    "aside": NodeListOf<HTMLElement>;
+    "audio": NodeListOf<HTMLAudioElement>;
+    "b": NodeListOf<HTMLElement>;
+    "base": NodeListOf<HTMLBaseElement>;
+    "basefont": NodeListOf<HTMLBaseFontElement>;
+    "bdo": NodeListOf<HTMLElement>;
+    "big": NodeListOf<HTMLElement>;
+    "blockquote": NodeListOf<HTMLQuoteElement>;
+    "body": NodeListOf<HTMLBodyElement>;
+    "br": NodeListOf<HTMLBRElement>;
+    "button": NodeListOf<HTMLButtonElement>;
+    "canvas": NodeListOf<HTMLCanvasElement>;
+    "caption": NodeListOf<HTMLTableCaptionElement>;
+    "center": NodeListOf<HTMLElement>;
+    "circle": NodeListOf<SVGCircleElement>;
+    "cite": NodeListOf<HTMLElement>;
+    "clippath": NodeListOf<SVGClipPathElement>;
+    "code": NodeListOf<HTMLElement>;
+    "col": NodeListOf<HTMLTableColElement>;
+    "colgroup": NodeListOf<HTMLTableColElement>;
+    "datalist": NodeListOf<HTMLDataListElement>;
+    "dd": NodeListOf<HTMLElement>;
+    "defs": NodeListOf<SVGDefsElement>;
+    "del": NodeListOf<HTMLModElement>;
+    "desc": NodeListOf<SVGDescElement>;
+    "dfn": NodeListOf<HTMLElement>;
+    "dir": NodeListOf<HTMLDirectoryElement>;
+    "div": NodeListOf<HTMLDivElement>;
+    "dl": NodeListOf<HTMLDListElement>;
+    "dt": NodeListOf<HTMLElement>;
+    "ellipse": NodeListOf<SVGEllipseElement>;
+    "em": NodeListOf<HTMLElement>;
+    "embed": NodeListOf<HTMLEmbedElement>;
+    "feblend": NodeListOf<SVGFEBlendElement>;
+    "fecolormatrix": NodeListOf<SVGFEColorMatrixElement>;
+    "fecomponenttransfer": NodeListOf<SVGFEComponentTransferElement>;
+    "fecomposite": NodeListOf<SVGFECompositeElement>;
+    "feconvolvematrix": NodeListOf<SVGFEConvolveMatrixElement>;
+    "fediffuselighting": NodeListOf<SVGFEDiffuseLightingElement>;
+    "fedisplacementmap": NodeListOf<SVGFEDisplacementMapElement>;
+    "fedistantlight": NodeListOf<SVGFEDistantLightElement>;
+    "feflood": NodeListOf<SVGFEFloodElement>;
+    "fefunca": NodeListOf<SVGFEFuncAElement>;
+    "fefuncb": NodeListOf<SVGFEFuncBElement>;
+    "fefuncg": NodeListOf<SVGFEFuncGElement>;
+    "fefuncr": NodeListOf<SVGFEFuncRElement>;
+    "fegaussianblur": NodeListOf<SVGFEGaussianBlurElement>;
+    "feimage": NodeListOf<SVGFEImageElement>;
+    "femerge": NodeListOf<SVGFEMergeElement>;
+    "femergenode": NodeListOf<SVGFEMergeNodeElement>;
+    "femorphology": NodeListOf<SVGFEMorphologyElement>;
+    "feoffset": NodeListOf<SVGFEOffsetElement>;
+    "fepointlight": NodeListOf<SVGFEPointLightElement>;
+    "fespecularlighting": NodeListOf<SVGFESpecularLightingElement>;
+    "fespotlight": NodeListOf<SVGFESpotLightElement>;
+    "fetile": NodeListOf<SVGFETileElement>;
+    "feturbulence": NodeListOf<SVGFETurbulenceElement>;
+    "fieldset": NodeListOf<HTMLFieldSetElement>;
+    "figcaption": NodeListOf<HTMLElement>;
+    "figure": NodeListOf<HTMLElement>;
+    "filter": NodeListOf<SVGFilterElement>;
+    "font": NodeListOf<HTMLFontElement>;
+    "footer": NodeListOf<HTMLElement>;
+    "foreignobject": NodeListOf<SVGForeignObjectElement>;
+    "form": NodeListOf<HTMLFormElement>;
+    "frame": NodeListOf<HTMLFrameElement>;
+    "frameset": NodeListOf<HTMLFrameSetElement>;
+    "g": NodeListOf<SVGGElement>;
+    "h1": NodeListOf<HTMLHeadingElement>;
+    "h2": NodeListOf<HTMLHeadingElement>;
+    "h3": NodeListOf<HTMLHeadingElement>;
+    "h4": NodeListOf<HTMLHeadingElement>;
+    "h5": NodeListOf<HTMLHeadingElement>;
+    "h6": NodeListOf<HTMLHeadingElement>;
+    "head": NodeListOf<HTMLHeadElement>;
+    "header": NodeListOf<HTMLElement>;
+    "hgroup": NodeListOf<HTMLElement>;
+    "hr": NodeListOf<HTMLHRElement>;
+    "html": NodeListOf<HTMLHtmlElement>;
+    "i": NodeListOf<HTMLElement>;
+    "iframe": NodeListOf<HTMLIFrameElement>;
+    "image": NodeListOf<SVGImageElement>;
+    "img": NodeListOf<HTMLImageElement>;
+    "input": NodeListOf<HTMLInputElement>;
+    "ins": NodeListOf<HTMLModElement>;
+    "isindex": NodeListOf<HTMLUnknownElement>;
+    "kbd": NodeListOf<HTMLElement>;
+    "keygen": NodeListOf<HTMLElement>;
+    "label": NodeListOf<HTMLLabelElement>;
+    "legend": NodeListOf<HTMLLegendElement>;
+    "li": NodeListOf<HTMLLIElement>;
+    "line": NodeListOf<SVGLineElement>;
+    "lineargradient": NodeListOf<SVGLinearGradientElement>;
+    "link": NodeListOf<HTMLLinkElement>;
+    "listing": NodeListOf<HTMLPreElement>;
+    "map": NodeListOf<HTMLMapElement>;
+    "mark": NodeListOf<HTMLElement>;
+    "marker": NodeListOf<SVGMarkerElement>;
+    "marquee": NodeListOf<HTMLMarqueeElement>;
+    "mask": NodeListOf<SVGMaskElement>;
+    "menu": NodeListOf<HTMLMenuElement>;
+    "meta": NodeListOf<HTMLMetaElement>;
+    "metadata": NodeListOf<SVGMetadataElement>;
+    "meter": NodeListOf<HTMLMeterElement>;
+    "nav": NodeListOf<HTMLElement>;
+    "nextid": NodeListOf<HTMLUnknownElement>;
+    "nobr": NodeListOf<HTMLElement>;
+    "noframes": NodeListOf<HTMLElement>;
+    "noscript": NodeListOf<HTMLElement>;
+    "object": NodeListOf<HTMLObjectElement>;
+    "ol": NodeListOf<HTMLOListElement>;
+    "optgroup": NodeListOf<HTMLOptGroupElement>;
+    "option": NodeListOf<HTMLOptionElement>;
+    "p": NodeListOf<HTMLParagraphElement>;
+    "param": NodeListOf<HTMLParamElement>;
+    "path": NodeListOf<SVGPathElement>;
+    "pattern": NodeListOf<SVGPatternElement>;
+    "picture": NodeListOf<HTMLPictureElement>;
+    "plaintext": NodeListOf<HTMLElement>;
+    "polygon": NodeListOf<SVGPolygonElement>;
+    "polyline": NodeListOf<SVGPolylineElement>;
+    "pre": NodeListOf<HTMLPreElement>;
+    "progress": NodeListOf<HTMLProgressElement>;
+    "q": NodeListOf<HTMLQuoteElement>;
+    "radialgradient": NodeListOf<SVGRadialGradientElement>;
+    "rect": NodeListOf<SVGRectElement>;
+    "rt": NodeListOf<HTMLElement>;
+    "ruby": NodeListOf<HTMLElement>;
+    "s": NodeListOf<HTMLElement>;
+    "samp": NodeListOf<HTMLElement>;
+    "script": NodeListOf<HTMLScriptElement>;
+    "section": NodeListOf<HTMLElement>;
+    "select": NodeListOf<HTMLSelectElement>;
+    "small": NodeListOf<HTMLElement>;
+    "source": NodeListOf<HTMLSourceElement>;
+    "span": NodeListOf<HTMLSpanElement>;
+    "stop": NodeListOf<SVGStopElement>;
+    "strike": NodeListOf<HTMLElement>;
+    "strong": NodeListOf<HTMLElement>;
+    "style": NodeListOf<HTMLStyleElement>;
+    "sub": NodeListOf<HTMLElement>;
+    "sup": NodeListOf<HTMLElement>;
+    "svg": NodeListOf<SVGSVGElement>;
+    "switch": NodeListOf<SVGSwitchElement>;
+    "symbol": NodeListOf<SVGSymbolElement>;
+    "table": NodeListOf<HTMLTableElement>;
+    "tbody": NodeListOf<HTMLTableSectionElement>;
+    "td": NodeListOf<HTMLTableDataCellElement>;
+    "template": NodeListOf<HTMLTemplateElement>;
+    "text": NodeListOf<SVGTextElement>;
+    "textpath": NodeListOf<SVGTextPathElement>;
+    "textarea": NodeListOf<HTMLTextAreaElement>;
+    "tfoot": NodeListOf<HTMLTableSectionElement>;
+    "th": NodeListOf<HTMLTableHeaderCellElement>;
+    "thead": NodeListOf<HTMLTableSectionElement>;
+    "title": NodeListOf<HTMLTitleElement>;
+    "tr": NodeListOf<HTMLTableRowElement>;
+    "track": NodeListOf<HTMLTrackElement>;
+    "tspan": NodeListOf<SVGTSpanElement>;
+    "tt": NodeListOf<HTMLElement>;
+    "u": NodeListOf<HTMLElement>;
+    "ul": NodeListOf<HTMLUListElement>;
+    "use": NodeListOf<SVGUseElement>;
+    "var": NodeListOf<HTMLElement>;
+    "video": NodeListOf<HTMLVideoElement>;
+    "view": NodeListOf<SVGViewElement>;
+    "wbr": NodeListOf<HTMLElement>;
+    "x-ms-webview": NodeListOf<MSHTMLWebViewElement>;
+    "xmp": NodeListOf<HTMLPreElement>;
+}
+
 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; };
@@ -14468,7 +13651,6 @@ declare function scroll(options?: ScrollToOptions): void;
 declare function scrollTo(options?: ScrollToOptions): void;
 declare function scrollBy(options?: ScrollToOptions): void;
 declare function toString(): string;
-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 clearInterval(handle: number): void;
@@ -14495,101 +13677,7 @@ declare var onwheel: (this: Window, ev: WheelEvent) => any;
 declare var indexedDB: IDBFactory;
 declare function atob(encodedString: string): string;
 declare function btoa(rawString: string): string;
-declare function addEventListener(type: "MSGestureChange", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureDoubleTap", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureEnd", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureHold", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureStart", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSGestureTap", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSInertiaStart", listener: (this: Window, ev: MSGestureEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerCancel", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerDown", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerEnter", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerLeave", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerMove", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOut", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerOver", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "MSPointerUp", listener: (this: Window, ev: MSPointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "abort", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "afterprint", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeprint", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "beforeunload", listener: (this: Window, ev: BeforeUnloadEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "blur", listener: (this: Window, ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplay", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "canplaythrough", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "change", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "click", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "compassneedscalibration", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "contextmenu", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dblclick", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "devicelight", listener: (this: Window, ev: DeviceLightEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "devicemotion", listener: (this: Window, ev: DeviceMotionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "deviceorientation", listener: (this: Window, ev: DeviceOrientationEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drag", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragend", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragenter", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragleave", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragover", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "dragstart", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "drop", listener: (this: Window, ev: DragEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "durationchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "emptied", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ended", listener: (this: Window, ev: MediaStreamErrorEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "focus", listener: (this: Window, ev: FocusEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "hashchange", listener: (this: Window, ev: HashChangeEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "input", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "invalid", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keydown", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keypress", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "keyup", listener: (this: Window, ev: KeyboardEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "load", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadeddata", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadedmetadata", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "loadstart", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "message", listener: (this: Window, ev: MessageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousedown", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseenter", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseleave", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousemove", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseout", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseover", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mouseup", listener: (this: Window, ev: MouseEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "mousewheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "offline", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "online", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "orientationchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pagehide", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pageshow", listener: (this: Window, ev: PageTransitionEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pause", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "play", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "playing", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointercancel", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerdown", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerenter", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerleave", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointermove", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerout", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerover", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "pointerup", listener: (this: Window, ev: PointerEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "popstate", listener: (this: Window, ev: PopStateEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "progress", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "ratechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "readystatechange", listener: (this: Window, ev: ProgressEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "reset", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "resize", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "scroll", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeked", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "seeking", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "select", listener: (this: Window, ev: UIEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "stalled", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "storage", listener: (this: Window, ev: StorageEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "submit", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "suspend", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "timeupdate", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "unload", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "volumechange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "waiting", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "wheel", listener: (this: Window, ev: WheelEvent) => any, useCapture?: boolean): void;
+declare function addEventListener<K extends keyof WindowEventMap>(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AAGUID = string;
 type AlgorithmIdentifier = string | Algorithm;
diff --git a/src/lib/es2017.object.d.ts b/src/lib/es2017.object.d.ts
index c219f467ac9..80c2161506a 100644
--- a/src/lib/es2017.object.d.ts
+++ b/src/lib/es2017.object.d.ts
@@ -4,11 +4,22 @@ interface ObjectConstructor {
       * @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.
       */
     values<T>(o: { [s: string]: T }): T[];
+
+    /**
+      * Returns an array of values of the enumerable properties 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.
+      */
     values(o: any): any[];
+
+    /**
+      * Returns an array of key/values of the enumerable properties 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.
+      */
+    entries<T>(o: { [s: string]: T }): [string, T][];
+
     /**
       * Returns an array of key/values of the enumerable properties 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.
       */
-    entries<T extends { [key: string]: any }, K extends keyof T>(o: T): [keyof T, T[K]][];
     entries(o: any): [string, any][];
 }
diff --git a/src/lib/es5.d.ts b/src/lib/es5.d.ts
index e402a96fade..1e6b44788b3 100644
--- a/src/lib/es5.d.ts
+++ b/src/lib/es5.d.ts
@@ -176,6 +176,18 @@ interface ObjectConstructor {
       */
     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>(a: T[]): ReadonlyArray<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 extends Function>(f: 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.
@@ -1367,7 +1379,7 @@ type Pick<T, K extends keyof T> = {
 /**
  * Construct a type with a set of properties K of type T
  */
-type Record<K extends string | number, T> = {
+type Record<K extends string, T> = {
     [P in K]: T;
 }
 
diff --git a/src/lib/webworker.generated.d.ts b/src/lib/webworker.generated.d.ts
index 130510334d6..089d0bdc5d5 100644
--- a/src/lib/webworker.generated.d.ts
+++ b/src/lib/webworker.generated.d.ts
@@ -8,6 +8,7 @@ interface Algorithm {
 }
 
 interface EventInit {
+    scoped?: boolean;
     bubbles?: boolean;
     cancelable?: boolean;
 }
@@ -242,10 +243,12 @@ interface Event {
     readonly target: EventTarget;
     readonly timeStamp: number;
     readonly type: string;
+    readonly scoped: boolean;
     initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean): void;
     preventDefault(): void;
     stopImmediatePropagation(): void;
     stopPropagation(): void;
+    deepPath(): EventTarget[];
     readonly AT_TARGET: number;
     readonly BUBBLING_PHASE: number;
     readonly CAPTURING_PHASE: number;
@@ -298,6 +301,7 @@ interface FileReader extends EventTarget, MSBaseReader {
     readAsBinaryString(blob: Blob): void;
     readAsDataURL(blob: Blob): void;
     readAsText(blob: Blob, encoding?: string): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -339,11 +343,16 @@ declare var IDBCursorWithValue: {
     new(): IDBCursorWithValue;
 }
 
+interface IDBDatabaseEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBDatabase extends EventTarget {
     readonly name: string;
     readonly objectStoreNames: DOMStringList;
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBDatabase, ev: Event) => any;
+    onerror: (this: IDBDatabase, ev: ErrorEvent) => any;
     version: number;
     onversionchange: (ev: IDBVersionChangeEvent) => any;
     close(): void;
@@ -351,8 +360,7 @@ interface IDBDatabase extends EventTarget {
     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: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBDatabaseEventMap>(type: K, listener: (this: IDBDatabase, ev: IDBDatabaseEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -429,13 +437,15 @@ declare var IDBObjectStore: {
     new(): IDBObjectStore;
 }
 
+interface IDBOpenDBRequestEventMap extends IDBRequestEventMap {
+    "blocked": Event;
+    "upgradeneeded": IDBVersionChangeEvent;
+}
+
 interface IDBOpenDBRequest extends IDBRequest {
-    onblocked: (this: this, ev: Event) => any;
-    onupgradeneeded: (this: this, ev: IDBVersionChangeEvent) => any;
-    addEventListener(type: "blocked", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "upgradeneeded", listener: (this: this, ev: IDBVersionChangeEvent) => any, useCapture?: boolean): void;
+    onblocked: (this: IDBOpenDBRequest, ev: Event) => any;
+    onupgradeneeded: (this: IDBOpenDBRequest, ev: IDBVersionChangeEvent) => any;
+    addEventListener<K extends keyof IDBOpenDBRequestEventMap>(type: K, listener: (this: IDBOpenDBRequest, ev: IDBOpenDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -444,16 +454,20 @@ declare var IDBOpenDBRequest: {
     new(): IDBOpenDBRequest;
 }
 
+interface IDBRequestEventMap {
+    "error": ErrorEvent;
+    "success": Event;
+}
+
 interface IDBRequest extends EventTarget {
     readonly error: DOMError;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onsuccess: (this: this, ev: Event) => any;
+    onerror: (this: IDBRequest, ev: ErrorEvent) => any;
+    onsuccess: (this: IDBRequest, ev: Event) => any;
     readonly readyState: string;
     readonly result: any;
     source: IDBObjectStore | IDBIndex | IDBCursor;
     readonly transaction: IDBTransaction;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "success", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBRequestEventMap>(type: K, listener: (this: IDBRequest, ev: IDBRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -462,21 +476,25 @@ declare var IDBRequest: {
     new(): IDBRequest;
 }
 
+interface IDBTransactionEventMap {
+    "abort": Event;
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface IDBTransaction extends EventTarget {
     readonly db: IDBDatabase;
     readonly error: DOMError;
     readonly mode: string;
-    onabort: (this: this, ev: Event) => any;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onabort: (this: IDBTransaction, ev: Event) => any;
+    oncomplete: (this: IDBTransaction, ev: Event) => any;
+    onerror: (this: IDBTransaction, ev: ErrorEvent) => any;
     abort(): void;
     objectStore(name: string): IDBObjectStore;
     readonly READ_ONLY: string;
     readonly READ_WRITE: string;
     readonly VERSION_CHANGE: string;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof IDBTransactionEventMap>(type: K, listener: (this: IDBTransaction, ev: IDBTransactionEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -533,18 +551,22 @@ interface MSApp {
 }
 declare var MSApp: MSApp;
 
+interface MSAppAsyncOperationEventMap {
+    "complete": Event;
+    "error": ErrorEvent;
+}
+
 interface MSAppAsyncOperation extends EventTarget {
     readonly error: DOMError;
-    oncomplete: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    oncomplete: (this: MSAppAsyncOperation, ev: Event) => any;
+    onerror: (this: MSAppAsyncOperation, ev: ErrorEvent) => any;
     readonly readyState: number;
     readonly result: any;
     start(): void;
     readonly COMPLETED: number;
     readonly ERROR: number;
     readonly STARTED: number;
-    addEventListener(type: "complete", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSAppAsyncOperationEventMap>(type: K, listener: (this: MSAppAsyncOperation, ev: MSAppAsyncOperationEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -584,6 +606,7 @@ interface MSStreamReader extends EventTarget, MSBaseReader {
     readAsBlob(stream: MSStream, size?: number): void;
     readAsDataURL(stream: MSStream, size?: number): void;
     readAsText(stream: MSStream, encoding?: string, size?: number): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -627,12 +650,16 @@ declare var MessageEvent: {
     new(type: string, eventInitDict?: MessageEventInit): MessageEvent;
 }
 
+interface MessagePortEventMap {
+    "message": MessageEvent;
+}
+
 interface MessagePort extends EventTarget {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: MessagePort, ev: MessageEvent) => any;
     close(): void;
     postMessage(message?: any, ports?: any): void;
     start(): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MessagePortEventMap>(type: K, listener: (this: MessagePort, ev: MessagePortEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -680,14 +707,21 @@ declare var ProgressEvent: {
     new(type: string, eventInitDict?: ProgressEventInit): ProgressEvent;
 }
 
+interface WebSocketEventMap {
+    "close": CloseEvent;
+    "error": ErrorEvent;
+    "message": MessageEvent;
+    "open": Event;
+}
+
 interface WebSocket extends EventTarget {
     binaryType: string;
     readonly bufferedAmount: number;
     readonly extensions: string;
-    onclose: (this: this, ev: CloseEvent) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onmessage: (this: this, ev: MessageEvent) => any;
-    onopen: (this: this, ev: Event) => any;
+    onclose: (this: WebSocket, ev: CloseEvent) => any;
+    onerror: (this: WebSocket, ev: ErrorEvent) => any;
+    onmessage: (this: WebSocket, ev: MessageEvent) => any;
+    onopen: (this: WebSocket, ev: Event) => any;
     readonly protocol: string;
     readonly readyState: number;
     readonly url: string;
@@ -697,10 +731,7 @@ interface WebSocket extends EventTarget {
     readonly CLOSING: number;
     readonly CONNECTING: number;
     readonly OPEN: number;
-    addEventListener(type: "close", listener: (this: this, ev: CloseEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "open", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WebSocketEventMap>(type: K, listener: (this: WebSocket, ev: WebSocketEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -713,12 +744,15 @@ declare var WebSocket: {
     readonly OPEN: number;
 }
 
+interface WorkerEventMap extends AbstractWorkerEventMap {
+    "message": MessageEvent;
+}
+
 interface Worker extends EventTarget, AbstractWorker {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: Worker, ev: MessageEvent) => any;
     postMessage(message: any, ports?: any): void;
     terminate(): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -727,8 +761,12 @@ declare var Worker: {
     new(stringUrl: string): Worker;
 }
 
+interface XMLHttpRequestEventMap extends XMLHttpRequestEventTargetEventMap {
+    "readystatechange": Event;
+}
+
 interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
-    onreadystatechange: (this: this, ev: Event) => any;
+    onreadystatechange: (this: XMLHttpRequest, ev: Event) => any;
     readonly readyState: number;
     readonly response: any;
     readonly responseText: string;
@@ -755,14 +793,7 @@ interface XMLHttpRequest extends EventTarget, XMLHttpRequestEventTarget {
     readonly LOADING: number;
     readonly OPENED: number;
     readonly UNSENT: number;
-    addEventListener(type: "abort", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "readystatechange", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof XMLHttpRequestEventMap>(type: K, listener: (this: XMLHttpRequest, ev: XMLHttpRequestEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -778,6 +809,7 @@ declare var XMLHttpRequest: {
 }
 
 interface XMLHttpRequestUpload extends EventTarget, XMLHttpRequestEventTarget {
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -786,31 +818,39 @@ declare var XMLHttpRequestUpload: {
     new(): XMLHttpRequestUpload;
 }
 
+interface AbstractWorkerEventMap {
+    "error": ErrorEvent;
+}
+
 interface AbstractWorker {
-    onerror: (this: this, ev: ErrorEvent) => any;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
+    onerror: (this: AbstractWorker, ev: ErrorEvent) => any;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: AbstractWorker, ev: AbstractWorkerEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
+interface MSBaseReaderEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+}
+
 interface MSBaseReader {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
+    onabort: (this: MSBaseReader, ev: Event) => any;
+    onerror: (this: MSBaseReader, ev: ErrorEvent) => any;
+    onload: (this: MSBaseReader, ev: Event) => any;
+    onloadend: (this: MSBaseReader, ev: ProgressEvent) => any;
+    onloadstart: (this: MSBaseReader, ev: Event) => any;
+    onprogress: (this: MSBaseReader, ev: ProgressEvent) => any;
     readonly readyState: number;
     readonly result: any;
     abort(): void;
     readonly DONE: number;
     readonly EMPTY: number;
     readonly LOADING: number;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof MSBaseReaderEventMap>(type: K, listener: (this: MSBaseReader, ev: MSBaseReaderEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -838,21 +878,25 @@ interface WindowConsole {
     readonly console: Console;
 }
 
+interface XMLHttpRequestEventTargetEventMap {
+    "abort": Event;
+    "error": ErrorEvent;
+    "load": Event;
+    "loadend": ProgressEvent;
+    "loadstart": Event;
+    "progress": ProgressEvent;
+    "timeout": ProgressEvent;
+}
+
 interface XMLHttpRequestEventTarget {
-    onabort: (this: this, ev: Event) => any;
-    onerror: (this: this, ev: ErrorEvent) => any;
-    onload: (this: this, ev: Event) => any;
-    onloadend: (this: this, ev: ProgressEvent) => any;
-    onloadstart: (this: this, ev: Event) => any;
-    onprogress: (this: this, ev: ProgressEvent) => any;
-    ontimeout: (this: this, ev: ProgressEvent) => any;
-    addEventListener(type: "abort", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "load", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadend", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "loadstart", listener: (this: this, ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "progress", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "timeout", listener: (this: this, ev: ProgressEvent) => any, useCapture?: boolean): void;
+    onabort: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onerror: (this: XMLHttpRequestEventTarget, ev: ErrorEvent) => any;
+    onload: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onloadend: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    onloadstart: (this: XMLHttpRequestEventTarget, ev: Event) => any;
+    onprogress: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    ontimeout: (this: XMLHttpRequestEventTarget, ev: ProgressEvent) => any;
+    addEventListener<K extends keyof XMLHttpRequestEventTargetEventMap>(type: K, listener: (this: XMLHttpRequestEventTarget, ev: XMLHttpRequestEventTargetEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -868,15 +912,18 @@ declare var FileReaderSync: {
     new(): FileReaderSync;
 }
 
+interface WorkerGlobalScopeEventMap extends DedicatedWorkerGlobalScopeEventMap {
+    "error": ErrorEvent;
+}
+
 interface WorkerGlobalScope extends EventTarget, WorkerUtils, DedicatedWorkerGlobalScope, WindowConsole {
     readonly location: WorkerLocation;
-    onerror: (this: this, ev: ErrorEvent) => any;
+    onerror: (this: WorkerGlobalScope, ev: ErrorEvent) => any;
     readonly self: WorkerGlobalScope;
     close(): void;
     msWriteProfilerMark(profilerMarkName: string): void;
     toString(): string;
-    addEventListener(type: "error", listener: (this: this, ev: ErrorEvent) => any, useCapture?: boolean): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -904,7 +951,6 @@ declare var WorkerLocation: {
 
 interface WorkerNavigator extends Object, NavigatorID, NavigatorOnLine {
     readonly hardwareConcurrency: number;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
 declare var WorkerNavigator: {
@@ -912,10 +958,14 @@ declare var WorkerNavigator: {
     new(): WorkerNavigator;
 }
 
+interface DedicatedWorkerGlobalScopeEventMap {
+    "message": MessageEvent;
+}
+
 interface DedicatedWorkerGlobalScope {
-    onmessage: (this: this, ev: MessageEvent) => any;
+    onmessage: (this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any;
     postMessage(data: any): void;
-    addEventListener(type: "message", listener: (this: this, ev: MessageEvent) => any, useCapture?: boolean): void;
+    addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 }
 
@@ -1176,7 +1226,6 @@ 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 dispatchEvent(evt: Event): boolean;
 declare function removeEventListener(type: string, listener?: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 declare var indexedDB: IDBFactory;
@@ -1197,8 +1246,7 @@ declare function btoa(rawString: string): string;
 declare var onmessage: (this: WorkerGlobalScope, ev: MessageEvent) => any;
 declare function postMessage(data: any): void;
 declare var console: Console;
-declare function addEventListener(type: "error", listener: (this: WorkerGlobalScope, ev: ErrorEvent) => any, useCapture?: boolean): void;
-declare function addEventListener(type: "message", listener: (this: WorkerGlobalScope, ev: MessageEvent) => any, useCapture?: boolean): void;
+declare function addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, useCapture?: boolean): void;
 declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
 type AlgorithmIdentifier = string | Algorithm;
 type IDBKeyPath = string;
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 6a7cb049296..df46f32672f 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -257,7 +257,7 @@ namespace ts.server {
 
         private changedFiles: ScriptInfo[];
 
-        private toCanonicalFileName: (f: string) => string;
+        readonly toCanonicalFileName: (f: string) => string;
 
         public lastDeletedFile: ScriptInfo;
 
@@ -317,7 +317,7 @@ namespace ts.server {
             }
             switch (response.kind) {
                 case ActionSet:
-                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typingOptions, response.unresolvedImports, response.typings);
+                    this.typingsCache.updateTypingsForProject(response.projectName, response.compilerOptions, response.typeAcquisition, response.unresolvedImports, response.typings);
                     break;
                 case ActionInvalidate:
                     this.typingsCache.deleteTypingsForProject(response.projectName);
@@ -520,8 +520,10 @@ namespace ts.server {
         }
 
         private onConfigChangedForConfiguredProject(project: ConfiguredProject) {
-            this.logger.info(`Config file changed: ${project.getConfigFilePath()}`);
-            this.updateConfiguredProject(project);
+            const configFileName = project.getConfigFilePath();
+            this.logger.info(`Config file changed: ${configFileName}`);
+            const configFileErrors = this.updateConfiguredProject(project);
+            this.reportConfigFileDiagnostics(configFileName, configFileErrors, /*triggerFile*/ configFileName);
             this.refreshInferredProjects();
         }
 
@@ -775,7 +777,13 @@ namespace ts.server {
         }
 
         private findConfiguredProjectByProjectName(configFileName: NormalizedPath) {
-            return findProjectByName(configFileName, this.configuredProjects);
+            // make sure that casing of config file name is consistent
+            configFileName = asNormalizedPath(this.toCanonicalFileName(configFileName));
+            for (const proj of this.configuredProjects) {
+                if (proj.canonicalConfigFilePath === configFileName) {
+                    return proj;
+                }
+            }
         }
 
         private findExternalProjectByProjectName(projectFileName: string) {
@@ -821,7 +829,7 @@ namespace ts.server {
                 compilerOptions: parsedCommandLine.options,
                 configHasFilesProperty: config["files"] !== undefined,
                 wildcardDirectories: createMap(parsedCommandLine.wildcardDirectories),
-                typingOptions: parsedCommandLine.typingOptions,
+                typeAcquisition: parsedCommandLine.typeAcquisition,
                 compileOnSave: parsedCommandLine.compileOnSave
             };
             return { success: true, projectOptions, configFileErrors: errors };
@@ -845,7 +853,7 @@ namespace ts.server {
             return false;
         }
 
-        private createAndAddExternalProject(projectFileName: string, files: protocol.ExternalFile[], options: protocol.ExternalProjectCompilerOptions, typingOptions: TypingOptions) {
+        private createAndAddExternalProject(projectFileName: string, files: protocol.ExternalFile[], options: protocol.ExternalProjectCompilerOptions, typeAcquisition: TypeAcquisition) {
             const compilerOptions = convertCompilerOptions(options);
             const project = new ExternalProject(
                 projectFileName,
@@ -855,7 +863,7 @@ namespace ts.server {
                 /*languageServiceEnabled*/ !this.exceededTotalSizeLimitForNonTsFiles(compilerOptions, files, externalFilePropertyReader),
                 options.compileOnSave === undefined ? true : options.compileOnSave);
 
-            this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typingOptions, /*configFileErrors*/ undefined);
+            this.addFilesToProjectAndUpdateGraph(project, files, externalFilePropertyReader, /*clientFileName*/ undefined, typeAcquisition, /*configFileErrors*/ undefined);
             this.externalProjects.push(project);
             return project;
         }
@@ -883,7 +891,7 @@ namespace ts.server {
                 /*languageServiceEnabled*/ !sizeLimitExceeded,
                 projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave);
 
-            this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typingOptions, configFileErrors);
+            this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
 
             project.watchConfigFile(project => this.onConfigChangedForConfiguredProject(project));
             if (!sizeLimitExceeded) {
@@ -902,7 +910,7 @@ namespace ts.server {
             }
         }
 
-        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: T[], propertyReader: FilePropertyReader<T>, clientFileName: string, typingOptions: TypingOptions, configFileErrors: Diagnostic[]): void {
+        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: T[], propertyReader: FilePropertyReader<T>, clientFileName: string, typeAcquisition: TypeAcquisition, configFileErrors: Diagnostic[]): void {
             let errors: Diagnostic[];
             for (const f of files) {
                 const rootFilename = propertyReader.getFileName(f);
@@ -917,7 +925,7 @@ namespace ts.server {
                 }
             }
             project.setProjectErrors(concatenate(configFileErrors, errors));
-            project.setTypingOptions(typingOptions);
+            project.setTypeAcquisition(typeAcquisition);
             project.updateGraph();
         }
 
@@ -934,7 +942,7 @@ namespace ts.server {
             };
         }
 
-        private updateNonInferredProject<T>(project: ExternalProject | ConfiguredProject, newUncheckedFiles: T[], propertyReader: FilePropertyReader<T>, newOptions: CompilerOptions, newTypingOptions: TypingOptions, compileOnSave: boolean, configFileErrors: Diagnostic[]) {
+        private updateNonInferredProject<T>(project: ExternalProject | ConfiguredProject, newUncheckedFiles: T[], propertyReader: FilePropertyReader<T>, newOptions: CompilerOptions, newTypeAcquisition: TypeAcquisition, compileOnSave: boolean, configFileErrors: Diagnostic[]) {
             const oldRootScriptInfos = project.getRootScriptInfos();
             const newRootScriptInfos: ScriptInfo[] = [];
             const newRootScriptInfoMap: NormalizedPathMap<ScriptInfo> = createNormalizedPathMap<ScriptInfo>();
@@ -996,7 +1004,7 @@ namespace ts.server {
             }
 
             project.setCompilerOptions(newOptions);
-            (<ExternalProject | ConfiguredProject>project).setTypingOptions(newTypingOptions);
+            (<ExternalProject | ConfiguredProject>project).setTypeAcquisition(newTypeAcquisition);
 
             // VS only set the CompileOnSaveEnabled option in the request if the option was changed recently
             // therefore if it is undefined, it should not be updated.
@@ -1015,6 +1023,9 @@ namespace ts.server {
                 return;
             }
 
+            // note: the returned "success" is true does not mean the "configFileErrors" is empty.
+            // because we might have tolerated the errors and kept going. So always return the configFileErrors
+            // regardless the "success" here is true or not.
             const { success, projectOptions, configFileErrors } = this.convertConfigFileContentToProjectOptions(project.getConfigFilePath());
             if (!success) {
                 // reset project settings to default
@@ -1026,7 +1037,7 @@ namespace ts.server {
                 project.setCompilerOptions(projectOptions.compilerOptions);
                 if (!project.languageServiceEnabled) {
                     // language service is already disabled
-                    return;
+                    return configFileErrors;
                 }
                 project.disableLanguageService();
                 project.stopWatchingDirectory();
@@ -1036,8 +1047,9 @@ namespace ts.server {
                     project.enableLanguageService();
                 }
                 this.watchConfigDirectoryForProject(project, projectOptions);
-                this.updateNonInferredProject(project, projectOptions.files, fileNamePropertyReader, projectOptions.compilerOptions, projectOptions.typingOptions, projectOptions.compileOnSave, configFileErrors);
+                this.updateNonInferredProject(project, projectOptions.files, fileNamePropertyReader, projectOptions.compilerOptions, projectOptions.typeAcquisition, projectOptions.compileOnSave, configFileErrors);
             }
+            return configFileErrors;
         }
 
         createInferredProjectWithRootFileIfNecessary(root: ScriptInfo) {
@@ -1316,6 +1328,12 @@ namespace ts.server {
         }
 
         openExternalProject(proj: protocol.ExternalProject): void {
+            // typingOptions has been deprecated and is only supported for backward compatibility
+            // purposes. It should be removed in future releases - use typeAcquisition instead.
+            if (proj.typingOptions && !proj.typeAcquisition) {
+                const typeAcquisition = convertEnableAutoDiscoveryToEnable(proj.typingOptions);
+                proj.typeAcquisition = typeAcquisition;
+            }
             let tsConfigFiles: NormalizedPath[];
             const rootFiles: protocol.ExternalFile[] = [];
             for (const file of proj.rootFiles) {
@@ -1340,7 +1358,7 @@ namespace ts.server {
             if (externalProject) {
                 if (!tsConfigFiles) {
                     // external project already exists and not config files were added - update the project and return;
-                    this.updateNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, convertCompilerOptions(proj.options), proj.typingOptions, proj.options.compileOnSave, /*configFileErrors*/ undefined);
+                    this.updateNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, convertCompilerOptions(proj.options), proj.typeAcquisition, proj.options.compileOnSave, /*configFileErrors*/ undefined);
                     return;
                 }
                 // some config files were added to external project (that previously were not there)
@@ -1400,7 +1418,7 @@ namespace ts.server {
             else {
                 // no config files - remove the item from the collection
                 delete this.externalProjectToConfiguredProjectMap[proj.projectFileName];
-                this.createAndAddExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typingOptions);
+                this.createAndAddExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition);
             }
             this.refreshInferredProjects();
         }
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 8f57cbf4074..aa37008ff66 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -23,7 +23,7 @@ namespace ts.server {
             }
 
             this.resolveModuleName = (moduleName, containingFile, compilerOptions, host) => {
-                const globalCache = this.project.getTypingOptions().enableAutoDiscovery
+                const globalCache = this.project.getTypeAcquisition().enable
                     ? this.project.projectService.typingsInstaller.globalTypingsCacheLocation
                     : undefined;
                 const primaryResult = resolveModuleName(moduleName, containingFile, compilerOptions, host);
diff --git a/src/server/project.ts b/src/server/project.ts
index 82ecc6f3644..c28b29b944b 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -312,7 +312,7 @@ namespace ts.server {
             return this.projectName;
         }
         abstract getProjectRootPath(): string | undefined;
-        abstract getTypingOptions(): TypingOptions;
+        abstract getTypeAcquisition(): TypeAcquisition;
 
         getSourceFile(path: Path) {
             if (!this.program) {
@@ -802,9 +802,9 @@ namespace ts.server {
             }
         }
 
-        getTypingOptions(): TypingOptions {
+        getTypeAcquisition(): TypeAcquisition {
             return {
-                enableAutoDiscovery: allRootFilesAreJsOrDts(this),
+                enable: allRootFilesAreJsOrDts(this),
                 include: [],
                 exclude: []
             };
@@ -812,11 +812,12 @@ namespace ts.server {
     }
 
     export class ConfiguredProject extends Project {
-        private typingOptions: TypingOptions;
+        private typeAcquisition: TypeAcquisition;
         private projectFileWatcher: FileWatcher;
         private directoryWatcher: FileWatcher;
         private directoriesWatchedForWildcards: Map<FileWatcher>;
         private typeRootsWatchers: FileWatcher[];
+        readonly canonicalConfigFilePath: NormalizedPath;
 
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
@@ -830,6 +831,7 @@ namespace ts.server {
             languageServiceEnabled: boolean,
             public compileOnSaveEnabled: boolean) {
             super(configFileName, ProjectKind.Configured, projectService, documentRegistry, hasExplicitListOfFiles, languageServiceEnabled, compilerOptions, compileOnSaveEnabled);
+            this.canonicalConfigFilePath = asNormalizedPath(projectService.toCanonicalFileName(configFileName));
         }
 
         getConfigFilePath() {
@@ -844,12 +846,12 @@ namespace ts.server {
             this.projectErrors = projectErrors;
         }
 
-        setTypingOptions(newTypingOptions: TypingOptions): void {
-            this.typingOptions = newTypingOptions;
+        setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void {
+            this.typeAcquisition = newTypeAcquisition;
         }
 
-        getTypingOptions() {
-            return this.typingOptions;
+        getTypeAcquisition() {
+            return this.typeAcquisition;
         }
 
         watchConfigFile(callback: (project: ConfiguredProject) => void) {
@@ -939,7 +941,7 @@ namespace ts.server {
     }
 
     export class ExternalProject extends Project {
-        private typingOptions: TypingOptions;
+        private typeAcquisition: TypeAcquisition;
         constructor(externalProjectName: string,
             projectService: ProjectService,
             documentRegistry: ts.DocumentRegistry,
@@ -960,36 +962,36 @@ namespace ts.server {
             return getDirectoryPath(normalizeSlashes(this.getProjectName()));
         }
 
-        getTypingOptions() {
-            return this.typingOptions;
+        getTypeAcquisition() {
+            return this.typeAcquisition;
         }
 
         setProjectErrors(projectErrors: Diagnostic[]) {
             this.projectErrors = projectErrors;
         }
 
-        setTypingOptions(newTypingOptions: TypingOptions): void {
-            if (!newTypingOptions) {
+        setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void {
+            if (!newTypeAcquisition) {
                 // set default typings options
-                newTypingOptions = {
-                    enableAutoDiscovery: allRootFilesAreJsOrDts(this),
+                newTypeAcquisition = {
+                    enable: allRootFilesAreJsOrDts(this),
                     include: [],
                     exclude: []
                 };
             }
             else {
-                if (newTypingOptions.enableAutoDiscovery === undefined) {
+                if (newTypeAcquisition.enable === undefined) {
                     // if autoDiscovery was not specified by the caller - set it based on the content of the project
-                    newTypingOptions.enableAutoDiscovery = allRootFilesAreJsOrDts(this);
+                    newTypeAcquisition.enable = allRootFilesAreJsOrDts(this);
                 }
-                if (!newTypingOptions.include) {
-                    newTypingOptions.include = [];
+                if (!newTypeAcquisition.include) {
+                    newTypeAcquisition.include = [];
                 }
-                if (!newTypingOptions.exclude) {
-                    newTypingOptions.exclude = [];
+                if (!newTypeAcquisition.exclude) {
+                    newTypeAcquisition.exclude = [];
                 }
             }
-            this.typingOptions = newTypingOptions;
+            this.typeAcquisition = newTypeAcquisition;
         }
     }
 }
\ No newline at end of file
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index dad66f3cc71..1e29b029104 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -861,9 +861,13 @@ namespace ts.server.protocol {
          */
         options: ExternalProjectCompilerOptions;
         /**
-         * Explicitly specified typing options for the project
+         * @deprecated typingOptions. Use typeAcquisition instead
          */
-        typingOptions?: TypingOptions;
+        typingOptions?: TypeAcquisition;
+        /**
+         * Explicitly specified type acquisition for the project
+         */
+        typeAcquisition?: TypeAcquisition;
     }
 
     export interface CompileOnSaveMixin {
@@ -2113,6 +2117,40 @@ namespace ts.server.protocol {
         typingsInstallerVersion: string;
     }
 
+    export type BeginInstallTypesEventName = "beginInstallTypes";
+    export type EndInstallTypesEventName = "endInstallTypes";
+
+    export interface BeginInstallTypesEvent extends Event {
+        event: BeginInstallTypesEventName;
+        body: BeginInstallTypesEventBody;
+    }
+
+    export interface EndInstallTypesEvent extends Event {
+        event: EndInstallTypesEventName;
+        body: EndInstallTypesEventBody;
+    }
+
+    export interface InstallTypesEventBody {
+        /**
+         * correlation id to match begin and end events
+         */
+        eventId: number;
+        /**
+         * list of packages to install
+         */
+        packages: ReadonlyArray<string>;
+    }
+
+    export interface BeginInstallTypesEventBody extends InstallTypesEventBody {
+    }
+
+    export interface EndInstallTypesEventBody extends InstallTypesEventBody {
+        /**
+         * true if installation succeeded, otherwise false
+         */
+        success: boolean;
+    }
+
     export interface NavBarResponse extends Response {
         body?: NavigationBarItem[];
     }
diff --git a/src/server/server.ts b/src/server/server.ts
index 220b0d90c65..7367741b9ea 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -31,6 +31,7 @@ namespace ts.server {
                     os.tmpdir();
                 break;
             case "linux":
+            case "android":
                 basePath = (os.homedir && os.homedir()) ||
                     process.env.HOME ||
                     ((process.env.LOGNAME || process.env.USER) && `/home/${process.env.LOGNAME || process.env.USER}`) ||
@@ -197,7 +198,7 @@ namespace ts.server {
         private socket: NodeSocket;
         private projectService: ProjectService;
         private throttledOperations: ThrottledOperations;
-        private telemetrySender: EventSender;
+        private eventSender: EventSender;
 
         constructor(
             private readonly telemetryEnabled: boolean,
@@ -230,7 +231,7 @@ namespace ts.server {
         }
 
         setTelemetrySender(telemetrySender: EventSender) {
-            this.telemetrySender = telemetrySender;
+            this.eventSender = telemetrySender;
         }
 
         attach(projectService: ProjectService) {
@@ -275,8 +276,8 @@ namespace ts.server {
             this.installer.send({ projectName: p.getProjectName(), kind: "closeProject" });
         }
 
-        enqueueInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>): void {
-            const request = createInstallTypingsRequest(project, typingOptions, unresolvedImports);
+        enqueueInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void {
+            const request = createInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
             if (this.logger.hasLevel(LogLevel.verbose)) {
                 if (this.logger.hasLevel(LogLevel.verbose)) {
                     this.logger.info(`Scheduling throttled operation: ${JSON.stringify(request)}`);
@@ -290,12 +291,30 @@ namespace ts.server {
             });
         }
 
-        private handleMessage(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent) {
+        private handleMessage(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes) {
             if (this.logger.hasLevel(LogLevel.verbose)) {
                 this.logger.info(`Received response: ${JSON.stringify(response)}`);
             }
-            if (response.kind === EventInstall) {
-                if (this.telemetrySender) {
+
+            if (response.kind === EventBeginInstallTypes) {
+                if (!this.eventSender) {
+                    return;
+                }
+                const body: protocol.BeginInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                };
+                const eventName: protocol.BeginInstallTypesEventName = "beginInstallTypes";
+                this.eventSender.event(body, eventName);
+
+                return;
+            }
+
+            if (response.kind === EventEndInstallTypes) {
+                if (!this.eventSender) {
+                    return;
+                }
+                if (this.telemetryEnabled) {
                     const body: protocol.TypingsInstalledTelemetryEventBody = {
                         telemetryEventName: "typingsInstalled",
                         payload: {
@@ -305,10 +324,19 @@ namespace ts.server {
                         }
                     };
                     const eventName: protocol.TelemetryEventName = "telemetry";
-                    this.telemetrySender.event(body, eventName);
+                    this.eventSender.event(body, eventName);
                 }
+
+                const body: protocol.EndInstallTypesEventBody = {
+                    eventId: response.eventId,
+                    packages: response.packagesToInstall,
+                    success: response.installSuccess,
+                };
+                const eventName: protocol.EndInstallTypesEventName = "endInstallTypes";
+                this.eventSender.event(body, eventName);
                 return;
             }
+
             this.projectService.updateTypingsForProject(response);
             if (response.kind == ActionSet && this.socket) {
                 this.sendEvent(0, "setTypings", response);
@@ -577,6 +605,11 @@ namespace ts.server {
         }
     }
 
+    const localeStr = findArgument("--locale");
+    if (localeStr) {
+        validateLocaleAndSetLanguage(localeStr, sys);
+    }
+
     const useSingleInferredProject = hasArgument("--useSingleInferredProject");
     const disableAutomaticTypingAcquisition = hasArgument("--disableAutomaticTypingAcquisition");
     const telemetryEnabled = hasArgument(Arguments.EnableTelemetry);
@@ -598,4 +631,4 @@ namespace ts.server {
     (process as any).noAsar = true;
     // Start listening
     ioSession.listen();
-}
\ No newline at end of file
+}
diff --git a/src/server/shared.ts b/src/server/shared.ts
index 81a1f7fb55b..c56d4098e75 100644
--- a/src/server/shared.ts
+++ b/src/server/shared.ts
@@ -3,7 +3,8 @@
 namespace ts.server {
     export const ActionSet: ActionSet = "action::set";
     export const ActionInvalidate: ActionInvalidate = "action::invalidate";
-    export const EventInstall: EventInstall = "event::install";
+    export const EventBeginInstallTypes: EventBeginInstallTypes = "event::beginInstallTypes";
+    export const EventEndInstallTypes: EventEndInstallTypes = "event::endInstallTypes";
 
     export namespace Arguments {
         export const GlobalCacheLocation = "--globalTypingsCacheLocation";
diff --git a/src/server/types.d.ts b/src/server/types.d.ts
index a4032bf062e..9f53fa8def1 100644
--- a/src/server/types.d.ts
+++ b/src/server/types.d.ts
@@ -31,7 +31,7 @@ declare namespace ts.server {
         readonly fileNames: string[];
         readonly projectRootPath: ts.Path;
         readonly compilerOptions: ts.CompilerOptions;
-        readonly typingOptions: ts.TypingOptions;
+        readonly typeAcquisition: ts.TypeAcquisition;
         readonly unresolvedImports: SortedReadonlyArray<string>;
         readonly cachePath?: string;
         readonly kind: "discover";
@@ -43,10 +43,11 @@ declare namespace ts.server {
 
     export type ActionSet = "action::set";
     export type ActionInvalidate = "action::invalidate";
-    export type EventInstall = "event::install";
+    export type EventBeginInstallTypes = "event::beginInstallTypes";
+    export type EventEndInstallTypes = "event::endInstallTypes";
 
     export interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventInstall;
+        readonly kind: ActionSet | ActionInvalidate | EventBeginInstallTypes | EventEndInstallTypes;
     }
 
     export interface ProjectResponse extends TypingInstallerResponse {
@@ -54,7 +55,7 @@ declare namespace ts.server {
     }
 
     export interface SetTypings extends ProjectResponse {
-        readonly typingOptions: ts.TypingOptions;
+        readonly typeAcquisition: ts.TypeAcquisition;
         readonly compilerOptions: ts.CompilerOptions;
         readonly typings: string[];
         readonly unresolvedImports: SortedReadonlyArray<string>;
@@ -65,11 +66,20 @@ declare namespace ts.server {
         readonly kind: ActionInvalidate;
     }
 
-    export interface TypingsInstallEvent extends TypingInstallerResponse {
-        readonly packagesToInstall: ReadonlyArray<string>;
-        readonly kind: EventInstall;
-        readonly installSuccess: boolean;
+    export interface InstallTypes extends ProjectResponse {
+        readonly kind: EventBeginInstallTypes | EventEndInstallTypes;
+        readonly eventId: number;
         readonly typingsInstallerVersion: string;
+        readonly packagesToInstall: ReadonlyArray<string>;
+    }
+
+    export interface BeginInstallTypes extends InstallTypes {
+        readonly kind: EventBeginInstallTypes;
+    }
+
+    export interface EndInstallTypes extends InstallTypes {
+        readonly kind: EventEndInstallTypes;
+        readonly installSuccess: boolean;
     }
 
     export interface InstallTypingHost extends JsTyping.TypingResolutionHost {
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
index 9013622e24a..8b03d59003c 100644
--- a/src/server/typingsCache.ts
+++ b/src/server/typingsCache.ts
@@ -2,7 +2,7 @@
 
 namespace ts.server {
     export interface ITypingsInstaller {
-        enqueueInstallTypingsRequest(p: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>): void;
+        enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>): void;
         attach(projectService: ProjectService): void;
         onProjectClosed(p: Project): void;
         readonly globalTypingsCacheLocation: string;
@@ -16,7 +16,7 @@ namespace ts.server {
     };
 
     class TypingsCacheEntry {
-        readonly typingOptions: TypingOptions;
+        readonly typeAcquisition: TypeAcquisition;
         readonly compilerOptions: CompilerOptions;
         readonly typings: SortedReadonlyArray<string>;
         readonly unresolvedImports: SortedReadonlyArray<string>;
@@ -52,8 +52,8 @@ namespace ts.server {
         return unique === 0;
     }
 
-    function typingOptionsChanged(opt1: TypingOptions, opt2: TypingOptions): boolean {
-        return opt1.enableAutoDiscovery !== opt2.enableAutoDiscovery ||
+    function typeAcquisitionChanged(opt1: TypeAcquisition, opt2: TypeAcquisition): boolean {
+        return opt1.enable !== opt2.enable ||
             !setIsEqualTo(opt1.include, opt2.include) ||
             !setIsEqualTo(opt1.exclude, opt2.exclude);
     }
@@ -77,9 +77,9 @@ namespace ts.server {
         }
 
         getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray<string>, forceRefresh: boolean): SortedReadonlyArray<string> {
-            const typingOptions = project.getTypingOptions();
+            const typeAcquisition = project.getTypeAcquisition();
 
-            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+            if (!typeAcquisition || !typeAcquisition.enable) {
                 return <any>emptyArray;
             }
 
@@ -87,28 +87,28 @@ namespace ts.server {
             const result: SortedReadonlyArray<string> = entry ? entry.typings : <any>emptyArray;
             if (forceRefresh ||
                 !entry ||
-                typingOptionsChanged(typingOptions, entry.typingOptions) ||
+                typeAcquisitionChanged(typeAcquisition, entry.typeAcquisition) ||
                 compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions) ||
                 unresolvedImportsChanged(unresolvedImports, entry.unresolvedImports)) {
                 // Note: entry is now poisoned since it does not really contain typings for a given combination of compiler options\typings options.
                 // instead it acts as a placeholder to prevent issuing multiple requests
                 this.perProjectCache[project.getProjectName()] = {
                     compilerOptions: project.getCompilerOptions(),
-                    typingOptions,
+                    typeAcquisition,
                     typings: result,
                     unresolvedImports,
                     poisoned: true
                 };
                 // something has been changed, issue a request to update typings
-                this.installer.enqueueInstallTypingsRequest(project, typingOptions, unresolvedImports);
+                this.installer.enqueueInstallTypingsRequest(project, typeAcquisition, unresolvedImports);
             }
             return result;
         }
 
-        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]) {
+        updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, newTypings: string[]) {
             this.perProjectCache[projectName] = {
                 compilerOptions,
-                typingOptions,
+                typeAcquisition,
                 typings: toSortedReadonlyArray(newTypings),
                 unresolvedImports,
                 poisoned: false
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
index bdfdda3033c..19f794ad57c 100644
--- a/src/server/typingsInstaller/nodeTypingsInstaller.ts
+++ b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -70,13 +70,12 @@ namespace ts.server.typingsInstaller {
         private readonly npmPath: string;
         readonly typesRegistry: Map<void>;
 
-        constructor(globalTypingsCacheLocation: string, throttleLimit: number, telemetryEnabled: boolean, log: Log) {
+        constructor(globalTypingsCacheLocation: string, throttleLimit: number, log: Log) {
             super(
                 sys,
                 globalTypingsCacheLocation,
                 toPath("typingSafeList.json", __dirname, createGetCanonicalFileName(sys.useCaseSensitiveFileNames)),
                 throttleLimit,
-                telemetryEnabled,
                 log);
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Process id: ${process.pid}`);
@@ -113,7 +112,7 @@ namespace ts.server.typingsInstaller {
             });
         }
 
-        protected sendResponse(response: SetTypings | InvalidateCachedTypings) {
+        protected sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes) {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Sending response: ${JSON.stringify(response)}`);
             }
@@ -127,7 +126,7 @@ namespace ts.server.typingsInstaller {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(args)}'.`);
             }
-            const command = `${this.npmPath} install ${args.join(" ")} --save-dev`;
+            const command = `${this.npmPath} install ${args.join(" ")} --save-dev --user-agent="typesInstaller/${version}"`;
             const start = Date.now();
             let stdout: Buffer;
             let stderr: Buffer;
@@ -149,7 +148,6 @@ namespace ts.server.typingsInstaller {
 
     const logFilePath = findArgument(server.Arguments.LogFile);
     const globalTypingsCacheLocation = findArgument(server.Arguments.GlobalCacheLocation);
-    const telemetryEnabled = hasArgument(server.Arguments.EnableTelemetry);
 
     const log = new FileLog(logFilePath);
     if (log.isEnabled()) {
@@ -163,6 +161,6 @@ namespace ts.server.typingsInstaller {
         }
         process.exit(0);
     });
-    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, telemetryEnabled, log);
+    const installer = new NodeTypingsInstaller(globalTypingsCacheLocation, /*throttleLimit*/5, log);
     installer.listen();
 }
\ No newline at end of file
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
index 677e2c7bba0..7a09c1f6c21 100644
--- a/src/server/typingsInstaller/typingsInstaller.ts
+++ b/src/server/typingsInstaller/typingsInstaller.ts
@@ -97,7 +97,6 @@ namespace ts.server.typingsInstaller {
             readonly globalCachePath: string,
             readonly safeListPath: Path,
             readonly throttleLimit: number,
-            readonly telemetryEnabled: boolean,
             protected readonly log = nullLog) {
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Global cache location '${globalCachePath}', safe file path '${safeListPath}'`);
@@ -150,7 +149,7 @@ namespace ts.server.typingsInstaller {
                 req.projectRootPath,
                 this.safeListPath,
                 this.packageNameToTypingLocation,
-                req.typingOptions,
+                req.typeAcquisition,
                 req.unresolvedImports);
 
             if (this.log.isEnabled()) {
@@ -309,47 +308,58 @@ namespace ts.server.typingsInstaller {
             const requestId = this.installRunCount;
             this.installRunCount++;
 
+            // send progress event
+            this.sendResponse(<BeginInstallTypes>{
+                kind: EventBeginInstallTypes,
+                eventId: requestId,
+                typingsInstallerVersion: ts.version, // qualified explicitly to prevent occasional shadowing
+                projectName: req.projectName
+            });
+
             this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => {
-                if (this.telemetryEnabled) {
-                    this.sendResponse(<TypingsInstallEvent>{
-                        kind: EventInstall,
+                try {
+                    if (!ok) {
+                        if (this.log.isEnabled()) {
+                            this.log.writeLine(`install request failed, marking packages as missing to prevent repeated requests: ${JSON.stringify(filteredTypings)}`);
+                        }
+                        for (const typing of filteredTypings) {
+                            this.missingTypingsSet[typing] = true;
+                        }
+                        return;
+                    }
+
+                    // TODO: watch project directory
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine(`Installed typings ${JSON.stringify(scopedTypings)}`);
+                    }
+                    const installedTypingFiles: string[] = [];
+                    for (const packageName of filteredTypings) {
+                        const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost, this.log);
+                        if (!typingFile) {
+                            this.missingTypingsSet[packageName] = true;
+                            continue;
+                        }
+                        if (!this.packageNameToTypingLocation[packageName]) {
+                            this.packageNameToTypingLocation[packageName] = typingFile;
+                        }
+                        installedTypingFiles.push(typingFile);
+                    }
+                    if (this.log.isEnabled()) {
+                        this.log.writeLine(`Installed typing files ${JSON.stringify(installedTypingFiles)}`);
+                    }
+
+                    this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
+                }
+                finally {
+                    this.sendResponse(<EndInstallTypes>{
+                        kind: EventEndInstallTypes,
+                        eventId: requestId,
+                        projectName: req.projectName,
                         packagesToInstall: scopedTypings,
                         installSuccess: ok,
                         typingsInstallerVersion: ts.version // qualified explicitly to prevent occasional shadowing
                     });
                 }
-
-                if (!ok) {
-                    if (this.log.isEnabled()) {
-                        this.log.writeLine(`install request failed, marking packages as missing to prevent repeated requests: ${JSON.stringify(filteredTypings)}`);
-                    }
-                    for (const typing of filteredTypings) {
-                        this.missingTypingsSet[typing] = true;
-                    }
-                    return;
-                }
-
-                // TODO: watch project directory
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`Installed typings ${JSON.stringify(scopedTypings)}`);
-                }
-                const installedTypingFiles: string[] = [];
-                for (const packageName of filteredTypings) {
-                    const typingFile = typingToFileName(cachePath, packageName, this.installTypingHost, this.log);
-                    if (!typingFile) {
-                        this.missingTypingsSet[packageName] = true;
-                        continue;
-                    }
-                    if (!this.packageNameToTypingLocation[packageName]) {
-                        this.packageNameToTypingLocation[packageName] = typingFile;
-                    }
-                    installedTypingFiles.push(typingFile);
-                }
-                if (this.log.isEnabled()) {
-                    this.log.writeLine(`Installed typing files ${JSON.stringify(installedTypingFiles)}`);
-                }
-
-                this.sendResponse(this.createSetTypings(req, currentlyCachedTypings.concat(installedTypingFiles)));
             });
         }
 
@@ -391,7 +401,7 @@ namespace ts.server.typingsInstaller {
         private createSetTypings(request: DiscoverTypings, typings: string[]): SetTypings {
             return {
                 projectName: request.projectName,
-                typingOptions: request.typingOptions,
+                typeAcquisition: request.typeAcquisition,
                 compilerOptions: request.compilerOptions,
                 typings,
                 unresolvedImports: request.unresolvedImports,
@@ -417,6 +427,6 @@ namespace ts.server.typingsInstaller {
         }
 
         protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
-        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | TypingsInstallEvent): void;
+        protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
     }
 }
\ No newline at end of file
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index a52e5848de9..fd370da7fa1 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -46,12 +46,12 @@ namespace ts.server {
         }
     }
 
-    export function createInstallTypingsRequest(project: Project, typingOptions: TypingOptions, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
+    export function createInstallTypingsRequest(project: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray<string>, cachePath?: string): DiscoverTypings {
         return {
             projectName: project.getProjectName(),
             fileNames: project.getFileNames(/*excludeFilesFromExternalLibraries*/ true),
             compilerOptions: project.getCompilerOptions(),
-            typingOptions,
+            typeAcquisition,
             unresolvedImports,
             projectRootPath: getProjectRootPath(project),
             cachePath,
@@ -171,7 +171,7 @@ namespace ts.server {
         files?: string[];
         wildcardDirectories?: Map<WatchDirectoryFlags>;
         compilerOptions?: CompilerOptions;
-        typingOptions?: TypingOptions;
+        typeAcquisition?: TypeAcquisition;
         compileOnSave?: boolean;
     }
 
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index 4adda19689d..bda310f2d33 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -52,7 +52,7 @@ namespace ts.codefix {
                         // than another existing one. For example, you may have new imports from "./foo/bar"
                         // and "bar", when the new one is "bar/bar2" and the current one is "./foo/bar". The new
                         // one and the current one are not comparable (one relative path and one absolute path),
-                        // but the new one is worse than the other one, so should not add to the list.  
+                        // but the new one is worse than the other one, so should not add to the list.
                         updatedNewImports.push(existingAction);
                         break;
                     case ModuleSpecifierComparison.Worse:
@@ -145,7 +145,7 @@ namespace ts.codefix {
                     if (localSymbol && localSymbol.name === name && checkSymbolHasMeaning(localSymbol, currentTokenMeaning)) {
                         // check if this symbol is already used
                         const symbolId = getUniqueSymbolId(localSymbol);
-                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefaultExport*/ true));
+                        symbolIdActionMap.addActions(symbolId, getCodeActionForImport(moduleSymbol, /*isDefault*/ true));
                     }
                 }
 
@@ -483,7 +483,7 @@ namespace ts.codefix {
                                 const normalizedTypeRoots = map(typeRoots, typeRoot => toPath(typeRoot, /*basePath*/ undefined, getCanonicalFileName));
                                 for (const typeRoot of normalizedTypeRoots) {
                                     if (startsWith(moduleFileName, typeRoot)) {
-                                        let relativeFileName = moduleFileName.substring(typeRoot.length + 1);
+                                        const relativeFileName = moduleFileName.substring(typeRoot.length + 1);
                                         return removeExtensionAndIndexPostFix(relativeFileName);
                                     }
                                 }
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
index 7f594ad82b1..bcd8cebb017 100644
--- a/src/services/formatting/formatting.ts
+++ b/src/services/formatting/formatting.ts
@@ -886,12 +886,25 @@ namespace ts.formatting {
             else {
                 const tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
                 const startLinePosition = getStartPositionOfLine(tokenStart.line, sourceFile);
-                if (indentation !== tokenStart.character || indentationIsDifferent(indentationString, startLinePosition)) {
+                if (indentation !== characterToColumn(startLinePosition, tokenStart.character) || indentationIsDifferent(indentationString, startLinePosition)) {
                     recordReplace(startLinePosition, tokenStart.character, indentationString);
                 }
             }
         }
 
+        function characterToColumn(startLinePosition: number, characterInLine: number): number {
+            let column = 0;
+            for (let i = 0; i < characterInLine; i++) {
+                if (sourceFile.text.charCodeAt(startLinePosition + i) === CharacterCodes.tab) {
+                    column += options.tabSize - column % options.tabSize;
+                }
+                else {
+                    column++;
+                }
+            }
+            return column;
+        }
+
         function indentationIsDifferent(indentationString: string, startLinePosition: number): boolean {
             return indentationString !== sourceFile.text.substr(startLinePosition, indentationString.length);
         }
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
index 5e2f5e7b4c9..3369ac23223 100644
--- a/src/services/jsDoc.ts
+++ b/src/services/jsDoc.ts
@@ -52,7 +52,7 @@ namespace ts.JsDoc {
         // from Array<T> - Array<string> and Array<number>
         const documentationComment = <SymbolDisplayPart[]>[];
         forEachUnique(declarations, declaration => {
-            const comments = getJSDocComments(declaration, /*checkParentVariableStatement*/ true);
+            const comments = getCommentsFromJSDoc(declaration);
             if (!comments) {
                 return;
             }
diff --git a/src/services/jsTyping.ts b/src/services/jsTyping.ts
index 316dcd355c2..04ac60c4e74 100644
--- a/src/services/jsTyping.ts
+++ b/src/services/jsTyping.ts
@@ -48,7 +48,7 @@ namespace ts.JsTyping {
      * @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 typeAcquisition is used to customize the typing acquisition process
      * @param compilerOptions are used as a source for typing inference
      */
     export function discoverTypings(
@@ -57,14 +57,14 @@ namespace ts.JsTyping {
         projectRootPath: Path,
         safeListPath: Path,
         packageNameToTypingLocation: Map<string>,
-        typingOptions: TypingOptions,
+        typeAcquisition: TypeAcquisition,
         unresolvedImports: ReadonlyArray<string>):
         { cachedTypingPaths: string[], newTypingNames: string[], filesToWatch: string[] } {
 
         // A typing name to typing file path mapping
         const inferredTypings = createMap<string>();
 
-        if (!typingOptions || !typingOptions.enableAutoDiscovery) {
+        if (!typeAcquisition || !typeAcquisition.enable) {
             return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
         }
 
@@ -84,8 +84,8 @@ namespace ts.JsTyping {
         let searchDirs: string[] = [];
         let exclude: string[] = [];
 
-        mergeTypings(typingOptions.include);
-        exclude = typingOptions.exclude || [];
+        mergeTypings(typeAcquisition.include);
+        exclude = typeAcquisition.exclude || [];
 
         const possibleSearchDirs = map(fileNames, getDirectoryPath);
         if (projectRootPath) {
diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts
index 51ce9b6001d..1cbaa3d640f 100644
--- a/src/services/navigationBar.ts
+++ b/src/services/navigationBar.ts
@@ -225,8 +225,8 @@ namespace ts.NavigationBar {
                 break;
 
             default:
-                forEach(node.jsDocComments, jsDocComment => {
-                    forEach(jsDocComment.tags, tag => {
+                forEach(node.jsDoc, jsDoc => {
+                    forEach(jsDoc.tags, tag => {
                         if (tag.kind === SyntaxKind.JSDocTypedefTag) {
                             addLeafNode(tag);
                         }
diff --git a/src/services/services.ts b/src/services/services.ts
index ef50f4b5a2f..d28dd871105 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -45,7 +45,7 @@ namespace ts {
         public end: number;
         public flags: NodeFlags;
         public parent: Node;
-        public jsDocComments: JSDoc[];
+        public jsDoc: JSDoc[];
         public original: Node;
         public transformFlags: TransformFlags;
         private _children: Node[];
@@ -154,8 +154,8 @@ namespace ts {
                     pos = nodes.end;
                 };
                 // jsDocComments need to be the first children
-                if (this.jsDocComments) {
-                    for (const jsDocComment of this.jsDocComments) {
+                if (this.jsDoc) {
+                    for (const jsDocComment of this.jsDoc) {
                         processNode(jsDocComment);
                     }
                 }
@@ -1975,9 +1975,9 @@ namespace ts {
                     break;
                 default:
                     forEachChild(node, walk);
-                    if (node.jsDocComments) {
-                        for (const jsDocComment of node.jsDocComments) {
-                            forEachChild(jsDocComment, walk);
+                    if (node.jsDoc) {
+                        for (const jsDoc of node.jsDoc) {
+                            forEachChild(jsDoc, walk);
                         }
                     }
             }
diff --git a/src/services/shims.ts b/src/services/shims.ts
index 1c8132793a3..6184f1e2ff3 100644
--- a/src/services/shims.ts
+++ b/src/services/shims.ts
@@ -1138,7 +1138,7 @@ namespace ts {
                     if (result.error) {
                         return {
                             options: {},
-                            typingOptions: {},
+                            typeAcquisition: {},
                             files: [],
                             raw: {},
                             errors: [realizeDiagnostic(result.error, "\r\n")]
@@ -1150,7 +1150,7 @@ namespace ts {
 
                     return {
                         options: configFile.options,
-                        typingOptions: configFile.typingOptions,
+                        typeAcquisition: configFile.typeAcquisition,
                         files: configFile.fileNames,
                         raw: configFile.raw,
                         errors: realizeDiagnostics(configFile.errors, "\r\n")
@@ -1175,7 +1175,7 @@ namespace ts {
                     toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName),
                     toPath(info.safeListPath, info.safeListPath, getCanonicalFileName),
                     info.packageNameToTypingLocation,
-                    info.typingOptions,
+                    info.typeAcquisition,
                     info.unresolvedImports);
             });
         }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 82b13f82327..e19fdc0a84a 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -951,10 +951,10 @@ namespace ts {
         }
 
         if (node) {
-            if (node.jsDocComments) {
-                for (const jsDocComment of node.jsDocComments) {
-                    if (jsDocComment.tags) {
-                        for (const tag of jsDocComment.tags) {
+            if (node.jsDoc) {
+                for (const jsDoc of node.jsDoc) {
+                    if (jsDoc.tags) {
+                        for (const tag of jsDoc.tags) {
                             if (tag.pos <= position && position <= tag.end) {
                                 return tag;
                             }
diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types
index 7b01a59268f..e0341d97ec3 100644
--- a/tests/baselines/reference/ambientRequireFunction.types
+++ b/tests/baselines/reference/ambientRequireFunction.types
@@ -3,7 +3,7 @@
 
 const fs = require("fs");
 >fs : typeof "fs"
->require("fs") : typeof "fs"
+>require("fs") : any
 >require : (moduleName: string) => any
 >"fs" : "fs"
 
diff --git a/tests/baselines/reference/classAbstractAccessor.errors.txt b/tests/baselines/reference/classAbstractAccessor.errors.txt
new file mode 100644
index 00000000000..b43cfa9d7f1
--- /dev/null
+++ b/tests/baselines/reference/classAbstractAccessor.errors.txt
@@ -0,0 +1,17 @@
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(4,17): error TS1318: An abstract accessor cannot have an implementation.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts(6,17): error TS1318: An abstract accessor cannot have an implementation.
+
+
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts (2 errors) ====
+    
+    abstract class A {
+       abstract get a();
+       abstract get aa() { return 1; } // error
+                    ~~
+!!! error TS1318: An abstract accessor cannot have an implementation.
+       abstract set b(x: string);
+       abstract set bb(x: string) {} // error
+                    ~~
+!!! error TS1318: An abstract accessor cannot have an implementation.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/classAbstractAccessor.js b/tests/baselines/reference/classAbstractAccessor.js
new file mode 100644
index 00000000000..a1edf0cb88d
--- /dev/null
+++ b/tests/baselines/reference/classAbstractAccessor.js
@@ -0,0 +1,28 @@
+//// [classAbstractAccessor.ts]
+
+abstract class A {
+   abstract get a();
+   abstract get aa() { return 1; } // error
+   abstract set b(x: string);
+   abstract set bb(x: string) {} // error
+}
+
+
+//// [classAbstractAccessor.js]
+var A = (function () {
+    function A() {
+    }
+    Object.defineProperty(A.prototype, "aa", {
+        get: function () { return 1; } // error
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(A.prototype, "bb", {
+        set: function (x) { } // error
+        ,
+        enumerable: true,
+        configurable: true
+    });
+    return A;
+}());
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.js b/tests/baselines/reference/commaOperatorInConditionalExpression.js
new file mode 100644
index 00000000000..be1705936e4
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.js
@@ -0,0 +1,14 @@
+//// [commaOperatorInConditionalExpression.ts]
+function f (m: string) {
+    [1, 2, 3].map(i => {
+        return true? { [m]: i } : { [m]: i + 1 }
+    })
+}
+
+//// [commaOperatorInConditionalExpression.js]
+function f(m) {
+    [1, 2, 3].map(function (i) {
+        return true ? (_a = {}, _a[m] = i, _a) : (_b = {}, _b[m] = i + 1, _b);
+        var _a, _b;
+    });
+}
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.symbols b/tests/baselines/reference/commaOperatorInConditionalExpression.symbols
new file mode 100644
index 00000000000..18f749c5c5c
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.symbols
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/commaOperatorInConditionalExpression.ts ===
+function f (m: string) {
+>f : Symbol(f, Decl(commaOperatorInConditionalExpression.ts, 0, 0))
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+
+    [1, 2, 3].map(i => {
+>[1, 2, 3].map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+
+        return true? { [m]: i } : { [m]: i + 1 }
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+>m : Symbol(m, Decl(commaOperatorInConditionalExpression.ts, 0, 12))
+>i : Symbol(i, Decl(commaOperatorInConditionalExpression.ts, 1, 18))
+
+    })
+}
diff --git a/tests/baselines/reference/commaOperatorInConditionalExpression.types b/tests/baselines/reference/commaOperatorInConditionalExpression.types
new file mode 100644
index 00000000000..f46282f9b6b
--- /dev/null
+++ b/tests/baselines/reference/commaOperatorInConditionalExpression.types
@@ -0,0 +1,30 @@
+=== tests/cases/compiler/commaOperatorInConditionalExpression.ts ===
+function f (m: string) {
+>f : (m: string) => void
+>m : string
+
+    [1, 2, 3].map(i => {
+>[1, 2, 3].map(i => {        return true? { [m]: i } : { [m]: i + 1 }    }) : { [x: string]: number; }[]
+>[1, 2, 3].map : { <U>(this: [number, number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U]; <U>(this: [number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): U[]; }
+>[1, 2, 3] : number[]
+>1 : 1
+>2 : 2
+>3 : 3
+>map : { <U>(this: [number, number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U, U]; <U>(this: [number, number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U, U]; <U>(this: [number, number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U, U]; <U>(this: [number, number], callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): [U, U]; <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any): U[]; }
+>i => {        return true? { [m]: i } : { [m]: i + 1 }    } : (i: number) => { [x: string]: number; }
+>i : number
+
+        return true? { [m]: i } : { [m]: i + 1 }
+>true? { [m]: i } : { [m]: i + 1 } : { [x: string]: number; }
+>true : true
+>{ [m]: i } : { [x: string]: number; }
+>m : string
+>i : number
+>{ [m]: i + 1 } : { [x: string]: number; }
+>m : string
+>i + 1 : number
+>i : number
+>1 : 1
+
+    })
+}
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt b/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt
new file mode 100644
index 00000000000..deef6403761
--- /dev/null
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.errors.txt
@@ -0,0 +1,188 @@
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(6,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(10,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(14,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,17): error TS7006: Parameter 'a' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,19): error TS7006: Parameter 'b' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,21): error TS7006: Parameter 'c' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,23): error TS7006: Parameter 'd' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,25): error TS7006: Parameter 'x' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,27): error TS7006: Parameter 's' implicitly has an 'any' type.
+tests/cases/compiler/controlFlowSelfReferentialLoop.ts(18,29): error TS7006: Parameter 'ac' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/controlFlowSelfReferentialLoop.ts (28 errors) ====
+    
+    // Repro from #12319
+    
+    function md5(string:string): void {
+    
+        function FF(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function GG(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function HH(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        function II(a,b,c,d,x,s,ac) {
+                    ~
+!!! error TS7006: Parameter 'a' implicitly has an 'any' type.
+                      ~
+!!! error TS7006: Parameter 'b' implicitly has an 'any' type.
+                        ~
+!!! error TS7006: Parameter 'c' implicitly has an 'any' type.
+                          ~
+!!! error TS7006: Parameter 'd' implicitly has an 'any' type.
+                            ~
+!!! error TS7006: Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+                                ~~
+!!! error TS7006: Parameter 'ac' implicitly has an 'any' type.
+            return 0;
+        };
+    
+        var x=Array();
+        var k,AA,BB,CC,DD,a,b,c,d;
+        var S11=7, S12=12, S13=17, S14=22;
+        var S21=5, S22=9 , S23=14, S24=20;
+        var S31=4, S32=11, S33=16, S34=23;
+        var S41=6, S42=10, S43=15, S44=21;
+    
+        x = [1];
+    
+        a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+    
+        for (k=0;k<x.length;k+=16) {
+            AA=a; BB=b; CC=c; DD=d;
+            a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+            d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+            c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+            b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+            a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+            d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+            c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+            b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+            a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+            d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+            c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+            b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+            a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+            d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+            c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+            b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+            a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+            d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+            c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+            b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+            a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+            d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+            c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+            b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+            a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+            d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+            c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+            b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+            a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+            d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+            c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+            b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+            a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+            d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+            c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+            b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+            a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+            d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+            c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+            b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+            a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+            d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+            c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+            b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+            a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+            d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+            c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+            b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+            a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+            d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+            c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+            b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+            a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+            d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+            c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+            b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+            a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+            d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+            c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+            b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+            a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+            d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+            c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+            b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+        }
+    }
+    export default md5;
\ No newline at end of file
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
new file mode 100644
index 00000000000..f7dbc0a2324
--- /dev/null
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -0,0 +1,207 @@
+//// [controlFlowSelfReferentialLoop.ts]
+
+// Repro from #12319
+
+function md5(string:string): void {
+
+    function FF(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function GG(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function HH(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function II(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    var x=Array();
+    var k,AA,BB,CC,DD,a,b,c,d;
+    var S11=7, S12=12, S13=17, S14=22;
+    var S21=5, S22=9 , S23=14, S24=20;
+    var S31=4, S32=11, S33=16, S34=23;
+    var S41=6, S42=10, S43=15, S44=21;
+
+    x = [1];
+
+    a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+
+    for (k=0;k<x.length;k+=16) {
+        AA=a; BB=b; CC=c; DD=d;
+        a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+        d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+        c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+        b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+        a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+        d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+        c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+        b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+        a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+        d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+        c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+        b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+        a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+        d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+        c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+        b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+        a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+        d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+        c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+        b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+        a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+        d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+        c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+        b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+        a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+        d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+        c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+        b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+        a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+        d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+        c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+        b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+        a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+        d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+        c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+        b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+        a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+        d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+        c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+        b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+        a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+        d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+        c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+        b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+        a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+        d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+        c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+        b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+        a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+        d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+        c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+        b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+        a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+        d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+        c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+        b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+        a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+        d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+        c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+        b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+        a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+        d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+        c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+        b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+    }
+}
+export default md5;
+
+//// [controlFlowSelfReferentialLoop.js]
+// Repro from #12319
+"use strict";
+function md5(string) {
+    function FF(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function GG(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function HH(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    function II(a, b, c, d, x, s, ac) {
+        return 0;
+    }
+    ;
+    var x = Array();
+    var k, AA, BB, CC, DD, a, b, c, d;
+    var S11 = 7, S12 = 12, S13 = 17, S14 = 22;
+    var S21 = 5, S22 = 9, S23 = 14, S24 = 20;
+    var S31 = 4, S32 = 11, S33 = 16, S34 = 23;
+    var S41 = 6, S42 = 10, S43 = 15, S44 = 21;
+    x = [1];
+    a = 0x67452301;
+    b = 0xEFCDAB89;
+    c = 0x98BADCFE;
+    d = 0x10325476;
+    for (k = 0; k < x.length; k += 16) {
+        AA = a;
+        BB = b;
+        CC = c;
+        DD = d;
+        a = FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
+        d = FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
+        c = FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
+        b = FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
+        a = FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
+        d = FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
+        c = FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
+        b = FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
+        a = FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
+        d = FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
+        c = FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
+        b = FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
+        a = FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
+        d = FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
+        c = FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
+        b = FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
+        a = GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
+        d = GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
+        c = GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
+        b = GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
+        a = GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
+        d = GG(d, a, b, c, x[k + 10], S22, 0x2441453);
+        c = GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
+        b = GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
+        a = GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
+        d = GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
+        c = GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
+        b = GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
+        a = GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
+        d = GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
+        c = GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
+        b = GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
+        a = HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
+        d = HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
+        c = HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
+        b = HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
+        a = HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
+        d = HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
+        c = HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
+        b = HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
+        a = HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
+        d = HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
+        c = HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
+        b = HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
+        a = HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
+        d = HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
+        c = HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
+        b = HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
+        a = II(a, b, c, d, x[k + 0], S41, 0xF4292244);
+        d = II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
+        c = II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
+        b = II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
+        a = II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
+        d = II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
+        c = II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
+        b = II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
+        a = II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
+        d = II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
+        c = II(c, d, a, b, x[k + 6], S43, 0xA3014314);
+        b = II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
+        a = II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
+        d = II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
+        c = II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
+        b = II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
+    }
+}
+exports.__esModule = true;
+exports["default"] = md5;
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js
new file mode 100644
index 00000000000..218d760d6c5
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.js
@@ -0,0 +1,39 @@
+//// [exhaustiveSwitchWithWideningLiteralTypes.ts]
+
+// Repro from #12529
+
+class A {
+    readonly kind = "A"; // (property) A.kind: "A"
+}
+
+class B {
+    readonly kind = "B"; // (property) B.kind: "B"
+}
+
+function f(value: A | B): number {
+    switch(value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
+
+//// [exhaustiveSwitchWithWideningLiteralTypes.js]
+// Repro from #12529
+var A = (function () {
+    function A() {
+        this.kind = "A"; // (property) A.kind: "A"
+    }
+    return A;
+}());
+var B = (function () {
+    function B() {
+        this.kind = "B"; // (property) B.kind: "B"
+    }
+    return B;
+}());
+function f(value) {
+    switch (value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols
new file mode 100644
index 00000000000..929a394dc7b
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.symbols
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts ===
+
+// Repro from #12529
+
+class A {
+>A : Symbol(A, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 0, 0))
+
+    readonly kind = "A"; // (property) A.kind: "A"
+>kind : Symbol(A.kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9))
+}
+
+class B {
+>B : Symbol(B, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 5, 1))
+
+    readonly kind = "B"; // (property) B.kind: "B"
+>kind : Symbol(B.kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+}
+
+function f(value: A | B): number {
+>f : Symbol(f, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 9, 1))
+>value : Symbol(value, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 11, 11))
+>A : Symbol(A, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 0, 0))
+>B : Symbol(B, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 5, 1))
+
+    switch(value.kind) {
+>value.kind : Symbol(kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9), Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+>value : Symbol(value, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 11, 11))
+>kind : Symbol(kind, Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 3, 9), Decl(exhaustiveSwitchWithWideningLiteralTypes.ts, 7, 9))
+
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
diff --git a/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
new file mode 100644
index 00000000000..3955c80ff1e
--- /dev/null
+++ b/tests/baselines/reference/exhaustiveSwitchWithWideningLiteralTypes.types
@@ -0,0 +1,40 @@
+=== tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts ===
+
+// Repro from #12529
+
+class A {
+>A : A
+
+    readonly kind = "A"; // (property) A.kind: "A"
+>kind : "A"
+>"A" : "A"
+}
+
+class B {
+>B : B
+
+    readonly kind = "B"; // (property) B.kind: "B"
+>kind : "B"
+>"B" : "B"
+}
+
+function f(value: A | B): number {
+>f : (value: A | B) => number
+>value : A | B
+>A : A
+>B : B
+
+    switch(value.kind) {
+>value.kind : "A" | "B"
+>value : A | B
+>kind : "A" | "B"
+
+        case "A": return 0;
+>"A" : "A"
+>0 : 0
+
+        case "B": return 1;
+>"B" : "B"
+>1 : 1
+    }
+}
diff --git a/tests/baselines/reference/for-inStatements.errors.txt b/tests/baselines/reference/for-inStatements.errors.txt
index f0e6c950ebb..c5ca29d2150 100644
--- a/tests/baselines/reference/for-inStatements.errors.txt
+++ b/tests/baselines/reference/for-inStatements.errors.txt
@@ -1,7 +1,9 @@
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(33,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
+tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(50,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/statements/for-inStatements/for-inStatements.ts (1 errors) ====
+==== tests/cases/conformance/statements/for-inStatements/for-inStatements.ts (3 errors) ====
     var aString: string;
     for (aString in {}) { }
     
@@ -35,6 +37,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz()) { }
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
             return null;
         }
     
@@ -52,6 +56,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatements.ts(79,15):
             for (var x in this.biz()) { }
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/for-inStatementsInvalid.errors.txt b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
index 00ab58ab94d..f98349973a3 100644
--- a/tests/baselines/reference/for-inStatementsInvalid.errors.txt
+++ b/tests/baselines/reference/for-inStatementsInvalid.errors.txt
@@ -9,13 +9,15 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(1
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(20,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(22,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(29,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(31,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(38,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(46,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
+tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(48,18): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(51,23): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(62,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts (15 errors) ====
+==== tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts (17 errors) ====
     var aNumber: number;
     for (aNumber in {}) { }
          ~~~~~~~
@@ -69,6 +71,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
             return null;
         }
     
@@ -90,6 +94,8 @@ tests/cases/conformance/statements/for-inStatements/for-inStatementsInvalid.ts(6
 !!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
             for (var x in this.biz) { }
             for (var x in this) { }
+                     ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'keyof this'.
     
             for (var x in super.biz) { }
             for (var x in super.biz()) { }
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index d3767790ed2..09e6cf3ad96 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -8,7 +8,7 @@ function F<T>() {
 >T : T
 
   for (var a in expr) {
->a : string
+>a : keyof T
 >expr : T
   }
 }
diff --git a/tests/baselines/reference/implicitAnyInCatch.types b/tests/baselines/reference/implicitAnyInCatch.types
index d2a1be4a910..93cce09928e 100644
--- a/tests/baselines/reference/implicitAnyInCatch.types
+++ b/tests/baselines/reference/implicitAnyInCatch.types
@@ -22,7 +22,7 @@ class C {
 >temp : () => void
 
         for (var x in this) {
->x : string
+>x : keyof this
 >this : this
         }
     }
diff --git a/tests/baselines/reference/inOperatorWithGeneric.types b/tests/baselines/reference/inOperatorWithGeneric.types
index facdb7b50e2..eba9bf1419b 100644
--- a/tests/baselines/reference/inOperatorWithGeneric.types
+++ b/tests/baselines/reference/inOperatorWithGeneric.types
@@ -9,7 +9,7 @@ class C<T> {
 >T : T
 
         for (var p in x) {
->p : string
+>p : keyof T
 >x : T
         }
     }
diff --git a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
index 0985157e0da..5aeae5f160e 100644
--- a/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
+++ b/tests/baselines/reference/inOperatorWithInvalidOperands.errors.txt
@@ -1,8 +1,6 @@
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(12,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(13,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(14,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
-tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(16,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
-tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(17,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(19,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(20,11): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(30,16): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
@@ -19,7 +17,7 @@ tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInv
 tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts(43,17): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
 
 
-==== tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts (19 errors) ====
+==== tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInvalidOperands.ts (17 errors) ====
     enum E { a }
     
     var x: any;
@@ -42,11 +40,7 @@ tests/cases/conformance/expressions/binaryOperators/inOperator/inOperatorWithInv
 !!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra4 = a4 in x;
     var ra5 = null in x;
-              ~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra6 = undefined in x;
-              ~~~~~~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     var ra7 = E.a in x;
     var ra8 = false in x;
               ~~~~~
diff --git a/tests/baselines/reference/intersectionTypeNormalization.js b/tests/baselines/reference/intersectionTypeNormalization.js
index 8309b17f198..f6eea23e98e 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.js
+++ b/tests/baselines/reference/intersectionTypeNormalization.js
@@ -58,6 +58,51 @@ function getValueAsString(value: IntersectionFail): string {
         return '' + value.num;
     }
     return value.str;
+}
+
+// Repro from #12535
+
+namespace enums {
+    export const enum A {
+        a1,
+        a2,
+        a3,
+       // ... elements omitted for the sake of clarity
+        a75,
+        a76,
+        a77,
+    }
+    export const enum B {
+        b1,
+        b2,
+       // ... elements omitted for the sake of clarity
+        b86,
+        b87,
+    }
+    export const enum C {
+        c1,
+        c2,
+       // ... elements omitted for the sake of clarity
+        c210,
+        c211,
+    }
+    export type Genre = A | B | C;
+}
+
+type Foo = {
+    genreId: enums.Genre;
+};
+
+type Bar = {
+    genreId: enums.Genre;
+};
+
+type FooBar = Foo & Bar;
+
+function foo(so: any) {
+    const val = so as FooBar;
+    const isGenre = val.genreId;
+    return isGenre;
 }
 
 //// [intersectionTypeNormalization.js]
@@ -77,3 +122,8 @@ function getValueAsString(value) {
     }
     return value.str;
 }
+function foo(so) {
+    var val = so;
+    var isGenre = val.genreId;
+    return isGenre;
+}
diff --git a/tests/baselines/reference/intersectionTypeNormalization.symbols b/tests/baselines/reference/intersectionTypeNormalization.symbols
index a5a00c70407..fd81eac6d18 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.symbols
+++ b/tests/baselines/reference/intersectionTypeNormalization.symbols
@@ -240,3 +240,113 @@ function getValueAsString(value: IntersectionFail): string {
 >value : Symbol(value, Decl(intersectionTypeNormalization.ts, 54, 26))
 >str : Symbol(str, Decl(intersectionTypeNormalization.ts, 47, 35))
 }
+
+// Repro from #12535
+
+namespace enums {
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+
+    export const enum A {
+>A : Symbol(A, Decl(intersectionTypeNormalization.ts, 63, 17))
+
+        a1,
+>a1 : Symbol(A.a1, Decl(intersectionTypeNormalization.ts, 64, 25))
+
+        a2,
+>a2 : Symbol(A.a2, Decl(intersectionTypeNormalization.ts, 65, 11))
+
+        a3,
+>a3 : Symbol(A.a3, Decl(intersectionTypeNormalization.ts, 66, 11))
+
+       // ... elements omitted for the sake of clarity
+        a75,
+>a75 : Symbol(A.a75, Decl(intersectionTypeNormalization.ts, 67, 11))
+
+        a76,
+>a76 : Symbol(A.a76, Decl(intersectionTypeNormalization.ts, 69, 12))
+
+        a77,
+>a77 : Symbol(A.a77, Decl(intersectionTypeNormalization.ts, 70, 12))
+    }
+    export const enum B {
+>B : Symbol(B, Decl(intersectionTypeNormalization.ts, 72, 5))
+
+        b1,
+>b1 : Symbol(B.b1, Decl(intersectionTypeNormalization.ts, 73, 25))
+
+        b2,
+>b2 : Symbol(B.b2, Decl(intersectionTypeNormalization.ts, 74, 11))
+
+       // ... elements omitted for the sake of clarity
+        b86,
+>b86 : Symbol(B.b86, Decl(intersectionTypeNormalization.ts, 75, 11))
+
+        b87,
+>b87 : Symbol(B.b87, Decl(intersectionTypeNormalization.ts, 77, 12))
+    }
+    export const enum C {
+>C : Symbol(C, Decl(intersectionTypeNormalization.ts, 79, 5))
+
+        c1,
+>c1 : Symbol(C.c1, Decl(intersectionTypeNormalization.ts, 80, 25))
+
+        c2,
+>c2 : Symbol(C.c2, Decl(intersectionTypeNormalization.ts, 81, 11))
+
+       // ... elements omitted for the sake of clarity
+        c210,
+>c210 : Symbol(C.c210, Decl(intersectionTypeNormalization.ts, 82, 11))
+
+        c211,
+>c211 : Symbol(C.c211, Decl(intersectionTypeNormalization.ts, 84, 13))
+    }
+    export type Genre = A | B | C;
+>Genre : Symbol(Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+>A : Symbol(A, Decl(intersectionTypeNormalization.ts, 63, 17))
+>B : Symbol(B, Decl(intersectionTypeNormalization.ts, 72, 5))
+>C : Symbol(C, Decl(intersectionTypeNormalization.ts, 79, 5))
+}
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(intersectionTypeNormalization.ts, 88, 1))
+
+    genreId: enums.Genre;
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12))
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+>Genre : Symbol(enums.Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+
+};
+
+type Bar = {
+>Bar : Symbol(Bar, Decl(intersectionTypeNormalization.ts, 92, 2))
+
+    genreId: enums.Genre;
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 94, 12))
+>enums : Symbol(enums, Decl(intersectionTypeNormalization.ts, 59, 1))
+>Genre : Symbol(enums.Genre, Decl(intersectionTypeNormalization.ts, 86, 5))
+
+};
+
+type FooBar = Foo & Bar;
+>FooBar : Symbol(FooBar, Decl(intersectionTypeNormalization.ts, 96, 2))
+>Foo : Symbol(Foo, Decl(intersectionTypeNormalization.ts, 88, 1))
+>Bar : Symbol(Bar, Decl(intersectionTypeNormalization.ts, 92, 2))
+
+function foo(so: any) {
+>foo : Symbol(foo, Decl(intersectionTypeNormalization.ts, 98, 24))
+>so : Symbol(so, Decl(intersectionTypeNormalization.ts, 100, 13))
+
+    const val = so as FooBar;
+>val : Symbol(val, Decl(intersectionTypeNormalization.ts, 101, 9))
+>so : Symbol(so, Decl(intersectionTypeNormalization.ts, 100, 13))
+>FooBar : Symbol(FooBar, Decl(intersectionTypeNormalization.ts, 96, 2))
+
+    const isGenre = val.genreId;
+>isGenre : Symbol(isGenre, Decl(intersectionTypeNormalization.ts, 102, 9))
+>val.genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12), Decl(intersectionTypeNormalization.ts, 94, 12))
+>val : Symbol(val, Decl(intersectionTypeNormalization.ts, 101, 9))
+>genreId : Symbol(genreId, Decl(intersectionTypeNormalization.ts, 90, 12), Decl(intersectionTypeNormalization.ts, 94, 12))
+
+    return isGenre;
+>isGenre : Symbol(isGenre, Decl(intersectionTypeNormalization.ts, 102, 9))
+}
diff --git a/tests/baselines/reference/intersectionTypeNormalization.types b/tests/baselines/reference/intersectionTypeNormalization.types
index 99d0ecb1f3a..3ffe7484afe 100644
--- a/tests/baselines/reference/intersectionTypeNormalization.types
+++ b/tests/baselines/reference/intersectionTypeNormalization.types
@@ -244,3 +244,114 @@ function getValueAsString(value: IntersectionFail): string {
 >value : { kind: "string"; str: string; } & ToString
 >str : string
 }
+
+// Repro from #12535
+
+namespace enums {
+>enums : typeof enums
+
+    export const enum A {
+>A : A
+
+        a1,
+>a1 : A.a1
+
+        a2,
+>a2 : A.a2
+
+        a3,
+>a3 : A.a3
+
+       // ... elements omitted for the sake of clarity
+        a75,
+>a75 : A.a75
+
+        a76,
+>a76 : A.a76
+
+        a77,
+>a77 : A.a77
+    }
+    export const enum B {
+>B : B
+
+        b1,
+>b1 : B.b1
+
+        b2,
+>b2 : B.b2
+
+       // ... elements omitted for the sake of clarity
+        b86,
+>b86 : B.b86
+
+        b87,
+>b87 : B.b87
+    }
+    export const enum C {
+>C : C
+
+        c1,
+>c1 : C.c1
+
+        c2,
+>c2 : C.c2
+
+       // ... elements omitted for the sake of clarity
+        c210,
+>c210 : C.c210
+
+        c211,
+>c211 : C.c211
+    }
+    export type Genre = A | B | C;
+>Genre : Genre
+>A : A
+>B : B
+>C : C
+}
+
+type Foo = {
+>Foo : Foo
+
+    genreId: enums.Genre;
+>genreId : enums.Genre
+>enums : any
+>Genre : enums.Genre
+
+};
+
+type Bar = {
+>Bar : Bar
+
+    genreId: enums.Genre;
+>genreId : enums.Genre
+>enums : any
+>Genre : enums.Genre
+
+};
+
+type FooBar = Foo & Bar;
+>FooBar : FooBar
+>Foo : Foo
+>Bar : Bar
+
+function foo(so: any) {
+>foo : (so: any) => enums.Genre
+>so : any
+
+    const val = so as FooBar;
+>val : FooBar
+>so as FooBar : FooBar
+>so : any
+>FooBar : FooBar
+
+    const isGenre = val.genreId;
+>isGenre : enums.Genre
+>val.genreId : enums.Genre
+>val : FooBar
+>genreId : enums.Genre
+
+    return isGenre;
+>isGenre : enums.Genre
+}
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.js b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
new file mode 100644
index 00000000000..61b034f1e03
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.js
@@ -0,0 +1,10 @@
+//// [intersectionTypeWithLeadingOperator.ts]
+type A = & string;
+type B =
+  & { foo: string }
+  & { bar: number };
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
+
+
+//// [intersectionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
new file mode 100644
index 00000000000..f6648183bb6
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/intersectionTypeWithLeadingOperator.ts ===
+type A = & string;
+>A : Symbol(A, Decl(intersectionTypeWithLeadingOperator.ts, 0, 0))
+
+type B =
+>B : Symbol(B, Decl(intersectionTypeWithLeadingOperator.ts, 0, 18))
+
+  & { foo: string }
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 2, 5))
+
+  & { bar: number };
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 3, 5))
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
+>C : Symbol(C, Decl(intersectionTypeWithLeadingOperator.ts, 3, 20))
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 5, 13))
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 5, 26))
+>foo : Symbol(foo, Decl(intersectionTypeWithLeadingOperator.ts, 5, 40))
+>bar : Symbol(bar, Decl(intersectionTypeWithLeadingOperator.ts, 5, 53))
+
diff --git a/tests/baselines/reference/intersectionTypeWithLeadingOperator.types b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
new file mode 100644
index 00000000000..9961f051f7f
--- /dev/null
+++ b/tests/baselines/reference/intersectionTypeWithLeadingOperator.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/intersectionTypeWithLeadingOperator.ts ===
+type A = & string;
+>A : string
+
+type B =
+>B : B
+
+  & { foo: string }
+>foo : string
+
+  & { bar: number };
+>bar : number
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
+>C : [{ foo: 1; } & { bar: 2; }, { foo: 3; } & { bar: 4; }]
+>foo : 1
+>bar : 2
+>foo : 3
+>bar : 4
+
diff --git a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
index bf5cf5c0f12..c69cc85ad9d 100644
--- a/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
+++ b/tests/baselines/reference/invalidImportAliasIdentifiers.errors.txt
@@ -1,6 +1,6 @@
 tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(5,12): error TS2503: Cannot find namespace 'V'.
 tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(11,12): error TS2503: Cannot find namespace 'C'.
-tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,12): error TS2693: 'I' only refers to a type, but is being used as a value here.
+tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts(23,12): error TS2702: 'I' only refers to a type, but is being used as a namespace here.
 
 
 ==== tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIdentifiers.ts (3 errors) ====
@@ -32,5 +32,5 @@ tests/cases/conformance/internalModules/importDeclarations/invalidImportAliasIde
     
     import i = I;
                ~
-!!! error TS2693: 'I' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'I' only refers to a type, but is being used as a namespace here.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt b/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt
new file mode 100644
index 00000000000..0353d46d632
--- /dev/null
+++ b/tests/baselines/reference/invalidUseOfTypeAsNamespace.errors.txt
@@ -0,0 +1,11 @@
+tests/cases/compiler/invalidUseOfTypeAsNamespace.ts(4,16): error TS2702: 'OhNo' only refers to a type, but is being used as a namespace here.
+
+
+==== tests/cases/compiler/invalidUseOfTypeAsNamespace.ts (1 errors) ====
+    interface OhNo {
+    }
+    
+    declare let y: OhNo.hello;
+                   ~~~~
+!!! error TS2702: 'OhNo' only refers to a type, but is being used as a namespace here.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidUseOfTypeAsNamespace.js b/tests/baselines/reference/invalidUseOfTypeAsNamespace.js
new file mode 100644
index 00000000000..3b598fdea9c
--- /dev/null
+++ b/tests/baselines/reference/invalidUseOfTypeAsNamespace.js
@@ -0,0 +1,8 @@
+//// [invalidUseOfTypeAsNamespace.ts]
+interface OhNo {
+}
+
+declare let y: OhNo.hello;
+
+
+//// [invalidUseOfTypeAsNamespace.js]
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.js b/tests/baselines/reference/isomorphicMappedTypeInference.js
new file mode 100644
index 00000000000..87f3e1c4017
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.js
@@ -0,0 +1,256 @@
+//// [isomorphicMappedTypeInference.ts]
+
+type Box<T> = {
+    value: T;
+}
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+}
+
+function box<T>(x: T): Box<T> {
+    return { value: x };
+}
+
+function unbox<T>(x: Box<T>): T {
+    return x.value;
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+    let result = {} as Boxified<T>;
+    for (let k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+    let result = {} as T;
+    for (let k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+    for (let k in values) {
+        obj[k].value = values[k];
+    }
+}
+
+function f1() {
+    let v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    let b = boxify(v);
+    let x: number = b.a.value;
+}
+
+function f2() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    let v = unboxify(b);
+    let x: number = v.a;
+}
+
+function f3() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+
+function f4() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+    return obj;
+}
+
+function f5(s: string) {
+    let b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v.a;
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+    return obj;
+}
+
+function f6(s: string) {
+    let b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v[s];
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+
+type Foo = {
+    a?: number;
+    readonly b: string;
+}
+
+function f10(foo: Foo) {
+    let x = validate(foo);  // { a: number, readonly b: string }
+    let y = clone(foo);  // { a?: number, b: string }
+    let z = validateAndClone(foo);  // { a: number, b: string }
+}
+
+//// [isomorphicMappedTypeInference.js]
+function box(x) {
+    return { value: x };
+}
+function unbox(x) {
+    return x.value;
+}
+function boxify(obj) {
+    var result = {};
+    for (var k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+function unboxify(obj) {
+    var result = {};
+    for (var k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+function assignBoxified(obj, values) {
+    for (var k in values) {
+        obj[k].value = values[k];
+    }
+}
+function f1() {
+    var v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    var b = boxify(v);
+    var x = b.a.value;
+}
+function f2() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    var v = unboxify(b);
+    var x = v.a;
+}
+function f3() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+function f4() {
+    var b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+function makeRecord(obj) {
+    return obj;
+}
+function f5(s) {
+    var b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    var v = unboxify(b);
+    var x = v.a;
+}
+function makeDictionary(obj) {
+    return obj;
+}
+function f6(s) {
+    var b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    var v = unboxify(b);
+    var x = v[s];
+}
+function f10(foo) {
+    var x = validate(foo); // { a: number, readonly b: string }
+    var y = clone(foo); // { a?: number, b: string }
+    var z = validateAndClone(foo); // { a: number, b: string }
+}
+
+
+//// [isomorphicMappedTypeInference.d.ts]
+declare type Box<T> = {
+    value: T;
+};
+declare type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+declare function box<T>(x: T): Box<T>;
+declare function unbox<T>(x: Box<T>): T;
+declare function boxify<T>(obj: T): Boxified<T>;
+declare function unboxify<T>(obj: Boxified<T>): T;
+declare function assignBoxified<T>(obj: Boxified<T>, values: T): void;
+declare function f1(): void;
+declare function f2(): void;
+declare function f3(): void;
+declare function f4(): void;
+declare function makeRecord<T, K extends string>(obj: {
+    [P in K]: T;
+}): {
+    [P in K]: T;
+};
+declare function f5(s: string): void;
+declare function makeDictionary<T>(obj: {
+    [x: string]: T;
+}): {
+    [x: string]: T;
+};
+declare function f6(s: string): void;
+declare function validate<T>(obj: {
+    [P in keyof T]?: T[P];
+}): T;
+declare function clone<T>(obj: {
+    readonly [P in keyof T]: T[P];
+}): T;
+declare function validateAndClone<T>(obj: {
+    readonly [P in keyof T]?: T[P];
+}): T;
+declare type Foo = {
+    a?: number;
+    readonly b: string;
+};
+declare function f10(foo: Foo): void;
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.symbols b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
new file mode 100644
index 00000000000..3e8a92e7691
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.symbols
@@ -0,0 +1,395 @@
+=== tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts ===
+
+type Box<T> = {
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 1, 9))
+
+    value: T;
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 1, 9))
+}
+
+type Boxified<T> = {
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+
+    [P in keyof T]: Box<T[P]>;
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 6, 5))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 5, 14))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 6, 5))
+}
+
+function box<T>(x: T): Box<T> {
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 9, 16))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 9, 13))
+
+    return { value: x };
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 10, 12))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 9, 16))
+}
+
+function unbox<T>(x: Box<T>): T {
+>unbox : Symbol(unbox, Decl(isomorphicMappedTypeInference.ts, 11, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 13, 18))
+>Box : Symbol(Box, Decl(isomorphicMappedTypeInference.ts, 0, 0))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 13, 15))
+
+    return x.value;
+>x.value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 13, 18))
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+
+    let result = {} as Boxified<T>;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 17, 16))
+
+    for (let k in obj) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+
+        result[k] = box(obj[k]);
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 17, 19))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 19, 12))
+    }
+    return result;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 18, 7))
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+
+    let result = {} as T;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 25, 18))
+
+    for (let k in obj) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+
+        result[k] = unbox(obj[k]);
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+>unbox : Symbol(unbox, Decl(isomorphicMappedTypeInference.ts, 11, 1))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 25, 21))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 27, 12))
+    }
+    return result;
+>result : Symbol(result, Decl(isomorphicMappedTypeInference.ts, 26, 7))
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+>assignBoxified : Symbol(assignBoxified, Decl(isomorphicMappedTypeInference.ts, 31, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 33, 27))
+>Boxified : Symbol(Boxified, Decl(isomorphicMappedTypeInference.ts, 3, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 33, 24))
+
+    for (let k in values) {
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+
+        obj[k].value = values[k];
+>obj[k].value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 33, 27))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>values : Symbol(values, Decl(isomorphicMappedTypeInference.ts, 33, 44))
+>k : Symbol(k, Decl(isomorphicMappedTypeInference.ts, 34, 12))
+    }
+}
+
+function f1() {
+>f1 : Symbol(f1, Decl(isomorphicMappedTypeInference.ts, 37, 1))
+
+    let v = {
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 40, 7))
+
+        a: 42,
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 40, 13))
+
+        b: "hello",
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 41, 14))
+
+        c: true
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 42, 19))
+
+    };
+    let b = boxify(v);
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 45, 7))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 40, 7))
+
+    let x: number = b.a.value;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 46, 7))
+>b.a.value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+>b.a : Symbol(a)
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 45, 7))
+>a : Symbol(a)
+>value : Symbol(value, Decl(isomorphicMappedTypeInference.ts, 1, 15))
+}
+
+function f2() {
+>f2 : Symbol(f2, Decl(isomorphicMappedTypeInference.ts, 47, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 50, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 51, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 52, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 55, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 50, 7))
+
+    let x: number = v.a;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 56, 7))
+>v.a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 55, 7))
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 50, 13))
+}
+
+function f3() {
+>f3 : Symbol(f3, Decl(isomorphicMappedTypeInference.ts, 57, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 60, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 60, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 61, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 62, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    assignBoxified(b, { c: false });
+>assignBoxified : Symbol(assignBoxified, Decl(isomorphicMappedTypeInference.ts, 31, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 60, 7))
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 65, 23))
+}
+
+function f4() {
+>f4 : Symbol(f4, Decl(isomorphicMappedTypeInference.ts, 66, 1))
+
+    let b = {
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 69, 13))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 70, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 71, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    };
+    b = boxify(unboxify(b));
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+
+    b = unboxify(boxify(b));
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>boxify : Symbol(boxify, Decl(isomorphicMappedTypeInference.ts, 15, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 69, 7))
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+>makeRecord : Symbol(makeRecord, Decl(isomorphicMappedTypeInference.ts, 76, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 78, 20))
+>K : Symbol(K, Decl(isomorphicMappedTypeInference.ts, 78, 22))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 78, 41))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 78, 49))
+>K : Symbol(K, Decl(isomorphicMappedTypeInference.ts, 78, 22))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 78, 20))
+
+    return obj;
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 78, 41))
+}
+
+function f5(s: string) {
+>f5 : Symbol(f5, Decl(isomorphicMappedTypeInference.ts, 80, 1))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 82, 12))
+
+    let b = makeRecord({
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 83, 7))
+>makeRecord : Symbol(makeRecord, Decl(isomorphicMappedTypeInference.ts, 76, 1))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 83, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 84, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 85, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    });
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 88, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 83, 7))
+
+    let x: string | number | boolean = v.a;
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 89, 7))
+>v.a : Symbol(a)
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 88, 7))
+>a : Symbol(a)
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+>makeDictionary : Symbol(makeDictionary, Decl(isomorphicMappedTypeInference.ts, 90, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 92, 24))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 92, 27))
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 92, 35))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 92, 24))
+
+    return obj;
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 92, 27))
+}
+
+function f6(s: string) {
+>f6 : Symbol(f6, Decl(isomorphicMappedTypeInference.ts, 94, 1))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 96, 12))
+
+    let b = makeDictionary({
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 97, 7))
+>makeDictionary : Symbol(makeDictionary, Decl(isomorphicMappedTypeInference.ts, 90, 1))
+
+        a: box(42),
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 97, 28))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        b: box("hello"),
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 98, 19))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+        c: box(true)
+>c : Symbol(c, Decl(isomorphicMappedTypeInference.ts, 99, 24))
+>box : Symbol(box, Decl(isomorphicMappedTypeInference.ts, 7, 1))
+
+    });
+    let v = unboxify(b);
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 102, 7))
+>unboxify : Symbol(unboxify, Decl(isomorphicMappedTypeInference.ts, 23, 1))
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 97, 7))
+
+    let x: string | number | boolean = v[s];
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 103, 7))
+>v : Symbol(v, Decl(isomorphicMappedTypeInference.ts, 102, 7))
+>s : Symbol(s, Decl(isomorphicMappedTypeInference.ts, 96, 12))
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+>validate : Symbol(validate, Decl(isomorphicMappedTypeInference.ts, 104, 1))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 106, 29))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 106, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 106, 37))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 106, 26))
+
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+>clone : Symbol(clone, Decl(isomorphicMappedTypeInference.ts, 106, 64))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 107, 26))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 107, 43))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 107, 43))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 107, 23))
+
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+>validateAndClone : Symbol(validateAndClone, Decl(isomorphicMappedTypeInference.ts, 107, 69))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>obj : Symbol(obj, Decl(isomorphicMappedTypeInference.ts, 108, 37))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 108, 54))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+>P : Symbol(P, Decl(isomorphicMappedTypeInference.ts, 108, 54))
+>T : Symbol(T, Decl(isomorphicMappedTypeInference.ts, 108, 34))
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(isomorphicMappedTypeInference.ts, 108, 81))
+
+    a?: number;
+>a : Symbol(a, Decl(isomorphicMappedTypeInference.ts, 110, 12))
+
+    readonly b: string;
+>b : Symbol(b, Decl(isomorphicMappedTypeInference.ts, 111, 15))
+}
+
+function f10(foo: Foo) {
+>f10 : Symbol(f10, Decl(isomorphicMappedTypeInference.ts, 113, 1))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+>Foo : Symbol(Foo, Decl(isomorphicMappedTypeInference.ts, 108, 81))
+
+    let x = validate(foo);  // { a: number, readonly b: string }
+>x : Symbol(x, Decl(isomorphicMappedTypeInference.ts, 116, 7))
+>validate : Symbol(validate, Decl(isomorphicMappedTypeInference.ts, 104, 1))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+
+    let y = clone(foo);  // { a?: number, b: string }
+>y : Symbol(y, Decl(isomorphicMappedTypeInference.ts, 117, 7))
+>clone : Symbol(clone, Decl(isomorphicMappedTypeInference.ts, 106, 64))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+
+    let z = validateAndClone(foo);  // { a: number, b: string }
+>z : Symbol(z, Decl(isomorphicMappedTypeInference.ts, 118, 7))
+>validateAndClone : Symbol(validateAndClone, Decl(isomorphicMappedTypeInference.ts, 107, 69))
+>foo : Symbol(foo, Decl(isomorphicMappedTypeInference.ts, 115, 13))
+}
diff --git a/tests/baselines/reference/isomorphicMappedTypeInference.types b/tests/baselines/reference/isomorphicMappedTypeInference.types
new file mode 100644
index 00000000000..eee2d6cbe7d
--- /dev/null
+++ b/tests/baselines/reference/isomorphicMappedTypeInference.types
@@ -0,0 +1,469 @@
+=== tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts ===
+
+type Box<T> = {
+>Box : Box<T>
+>T : T
+
+    value: T;
+>value : T
+>T : T
+}
+
+type Boxified<T> = {
+>Boxified : Boxified<T>
+>T : T
+
+    [P in keyof T]: Box<T[P]>;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+}
+
+function box<T>(x: T): Box<T> {
+>box : <T>(x: T) => Box<T>
+>T : T
+>x : T
+>T : T
+>Box : Box<T>
+>T : T
+
+    return { value: x };
+>{ value: x } : { value: T; }
+>value : T
+>x : T
+}
+
+function unbox<T>(x: Box<T>): T {
+>unbox : <T>(x: Box<T>) => T
+>T : T
+>x : Box<T>
+>Box : Box<T>
+>T : T
+>T : T
+
+    return x.value;
+>x.value : T
+>x : Box<T>
+>value : T
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : <T>(obj: T) => Boxified<T>
+>T : T
+>obj : T
+>T : T
+>Boxified : Boxified<T>
+>T : T
+
+    let result = {} as Boxified<T>;
+>result : Boxified<T>
+>{} as Boxified<T> : Boxified<T>
+>{} : {}
+>Boxified : Boxified<T>
+>T : T
+
+    for (let k in obj) {
+>k : keyof T
+>obj : T
+
+        result[k] = box(obj[k]);
+>result[k] = box(obj[k]) : Box<T[keyof T]>
+>result[k] : Box<T[keyof T]>
+>result : Boxified<T>
+>k : keyof T
+>box(obj[k]) : Box<T[keyof T]>
+>box : <T>(x: T) => Box<T>
+>obj[k] : T[keyof T]
+>obj : T
+>k : keyof T
+    }
+    return result;
+>result : Boxified<T>
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+>unboxify : <T>(obj: Boxified<T>) => T
+>T : T
+>obj : Boxified<T>
+>Boxified : Boxified<T>
+>T : T
+>T : T
+
+    let result = {} as T;
+>result : T
+>{} as T : T
+>{} : {}
+>T : T
+
+    for (let k in obj) {
+>k : keyof T
+>obj : Boxified<T>
+
+        result[k] = unbox(obj[k]);
+>result[k] = unbox(obj[k]) : T[keyof T]
+>result[k] : T[keyof T]
+>result : T
+>k : keyof T
+>unbox(obj[k]) : T[keyof T]
+>unbox : <T>(x: Box<T>) => T
+>obj[k] : Box<T[keyof T]>
+>obj : Boxified<T>
+>k : keyof T
+    }
+    return result;
+>result : T
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+>assignBoxified : <T>(obj: Boxified<T>, values: T) => void
+>T : T
+>obj : Boxified<T>
+>Boxified : Boxified<T>
+>T : T
+>values : T
+>T : T
+
+    for (let k in values) {
+>k : keyof T
+>values : T
+
+        obj[k].value = values[k];
+>obj[k].value = values[k] : T[keyof T]
+>obj[k].value : T[keyof T]
+>obj[k] : Box<T[keyof T]>
+>obj : Boxified<T>
+>k : keyof T
+>value : T[keyof T]
+>values[k] : T[keyof T]
+>values : T
+>k : keyof T
+    }
+}
+
+function f1() {
+>f1 : () => void
+
+    let v = {
+>v : { a: number; b: string; c: boolean; }
+>{        a: 42,        b: "hello",        c: true    } : { a: number; b: string; c: boolean; }
+
+        a: 42,
+>a : number
+>42 : 42
+
+        b: "hello",
+>b : string
+>"hello" : "hello"
+
+        c: true
+>c : boolean
+>true : true
+
+    };
+    let b = boxify(v);
+>b : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify(v) : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>v : { a: number; b: string; c: boolean; }
+
+    let x: number = b.a.value;
+>x : number
+>b.a.value : number
+>b.a : Box<number>
+>b : Boxified<{ a: number; b: string; c: boolean; }>
+>a : Box<number>
+>value : number
+}
+
+function f2() {
+>f2 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    let v = unboxify(b);
+>v : { a: number; b: string; c: boolean; }
+>unboxify(b) : { a: number; b: string; c: boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+    let x: number = v.a;
+>x : number
+>v.a : number
+>v : { a: number; b: string; c: boolean; }
+>a : number
+}
+
+function f3() {
+>f3 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    assignBoxified(b, { c: false });
+>assignBoxified(b, { c: false }) : void
+>assignBoxified : <T>(obj: Boxified<T>, values: T) => void
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{ c: false } : { c: false; }
+>c : boolean
+>false : false
+}
+
+function f4() {
+>f4 : () => void
+
+    let b = {
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    };
+    b = boxify(unboxify(b));
+>b = boxify(unboxify(b)) : Boxified<{ a: number; b: string; c: boolean; }>
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>boxify(unboxify(b)) : Boxified<{ a: number; b: string; c: boolean; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>unboxify(b) : { a: number; b: string; c: boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+    b = unboxify(boxify(b));
+>b = unboxify(boxify(b)) : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>unboxify(boxify(b)) : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>boxify(b) : Boxified<{ a: Box<number>; b: Box<string>; c: Box<boolean>; }>
+>boxify : <T>(obj: T) => Boxified<T>
+>b : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+>makeRecord : <T, K extends string>(obj: { [P in K]: T; }) => { [P in K]: T; }
+>T : T
+>K : K
+>obj : { [P in K]: T; }
+>P : P
+>K : K
+>T : T
+
+    return obj;
+>obj : { [P in K]: T; }
+}
+
+function f5(s: string) {
+>f5 : (s: string) => void
+>s : string
+
+    let b = makeRecord({
+>b : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+>makeRecord({        a: box(42),        b: box("hello"),        c: box(true)    }) : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+>makeRecord : <T, K extends string>(obj: { [P in K]: T; }) => { [P in K]: T; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    });
+    let v = unboxify(b);
+>v : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>unboxify(b) : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { a: Box<number> | Box<string> | Box<boolean>; b: Box<number> | Box<string> | Box<boolean>; c: Box<number> | Box<string> | Box<boolean>; }
+
+    let x: string | number | boolean = v.a;
+>x : string | number | boolean
+>v.a : string | number | boolean
+>v : { a: string | number | boolean; b: string | number | boolean; c: string | number | boolean; }
+>a : string | number | boolean
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+>makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
+>T : T
+>obj : { [x: string]: T; }
+>x : string
+>T : T
+
+    return obj;
+>obj : { [x: string]: T; }
+}
+
+function f6(s: string) {
+>f6 : (s: string) => void
+>s : string
+
+    let b = makeDictionary({
+>b : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+>makeDictionary({        a: box(42),        b: box("hello"),        c: box(true)    }) : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+>makeDictionary : <T>(obj: { [x: string]: T; }) => { [x: string]: T; }
+>{        a: box(42),        b: box("hello"),        c: box(true)    } : { a: Box<number>; b: Box<string>; c: Box<boolean>; }
+
+        a: box(42),
+>a : Box<number>
+>box(42) : Box<number>
+>box : <T>(x: T) => Box<T>
+>42 : 42
+
+        b: box("hello"),
+>b : Box<string>
+>box("hello") : Box<string>
+>box : <T>(x: T) => Box<T>
+>"hello" : "hello"
+
+        c: box(true)
+>c : Box<boolean>
+>box(true) : Box<boolean>
+>box : <T>(x: T) => Box<T>
+>true : true
+
+    });
+    let v = unboxify(b);
+>v : { [x: string]: string | number | boolean; }
+>unboxify(b) : { [x: string]: string | number | boolean; }
+>unboxify : <T>(obj: Boxified<T>) => T
+>b : { [x: string]: Box<number> | Box<string> | Box<boolean>; }
+
+    let x: string | number | boolean = v[s];
+>x : string | number | boolean
+>v[s] : string | number | boolean
+>v : { [x: string]: string | number | boolean; }
+>s : string
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+>validate : <T>(obj: { [P in keyof T]?: T[P] | undefined; }) => T
+>T : T
+>obj : { [P in keyof T]?: T[P] | undefined; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+>clone : <T>(obj: { readonly [P in keyof T]: T[P]; }) => T
+>T : T
+>obj : { readonly [P in keyof T]: T[P]; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+>validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
+>T : T
+>obj : { readonly [P in keyof T]?: T[P] | undefined; }
+>P : P
+>T : T
+>T : T
+>P : P
+>T : T
+
+type Foo = {
+>Foo : Foo
+
+    a?: number;
+>a : number | undefined
+
+    readonly b: string;
+>b : string
+}
+
+function f10(foo: Foo) {
+>f10 : (foo: Foo) => void
+>foo : Foo
+>Foo : Foo
+
+    let x = validate(foo);  // { a: number, readonly b: string }
+>x : { a: number; readonly b: string; }
+>validate(foo) : { a: number; readonly b: string; }
+>validate : <T>(obj: { [P in keyof T]?: T[P] | undefined; }) => T
+>foo : Foo
+
+    let y = clone(foo);  // { a?: number, b: string }
+>y : { a?: number | undefined; b: string; }
+>clone(foo) : { a?: number | undefined; b: string; }
+>clone : <T>(obj: { readonly [P in keyof T]: T[P]; }) => T
+>foo : Foo
+
+    let z = validateAndClone(foo);  // { a: number, b: string }
+>z : { a: number; b: string; }
+>validateAndClone(foo) : { a: number; b: string; }
+>validateAndClone : <T>(obj: { readonly [P in keyof T]?: T[P] | undefined; }) => T
+>foo : Foo
+}
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
new file mode 100644
index 00000000000..ecf7d13d89d
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -0,0 +1,27 @@
+//// [index.tsx]
+
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
+
+//// [index.js]
+"use strict";
+require("./jsx");
+var skate;
+var React = { createElement: skate.h };
+var Component = (function () {
+    function Component() {
+    }
+    Component.prototype.renderCallback = function () {
+        return skate.h("div", null, "test");
+    };
+    return Component;
+}());
+;
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
new file mode 100644
index 00000000000..35879c81ca6
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.symbols
@@ -0,0 +1,23 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+const React = { createElement: skate.h };
+>React : Symbol(React, Decl(index.tsx, 4, 5))
+>createElement : Symbol(createElement, Decl(index.tsx, 4, 15))
+>skate : Symbol(skate, Decl(index.tsx, 3, 3))
+
+class Component {
+>Component : Symbol(Component, Decl(index.tsx, 4, 41))
+
+    renderCallback() {
+>renderCallback : Symbol(Component.renderCallback, Decl(index.tsx, 6, 17))
+
+        return <div>test</div>;
+>div : Symbol(unknown)
+>div : Symbol(unknown)
+    }
+};
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
new file mode 100644
index 00000000000..21fd4bae84b
--- /dev/null
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/index.tsx ===
+
+import "./jsx";
+
+var skate: any;
+>skate : any
+
+const React = { createElement: skate.h };
+>React : { createElement: any; }
+>{ createElement: skate.h } : { createElement: any; }
+>createElement : any
+>skate.h : any
+>skate : any
+>h : any
+
+class Component {
+>Component : Component
+
+    renderCallback() {
+>renderCallback : () => any
+
+        return <div>test</div>;
+><div>test</div> : any
+>div : any
+>div : any
+    }
+};
diff --git a/tests/baselines/reference/keyofAndForIn.js b/tests/baselines/reference/keyofAndForIn.js
new file mode 100644
index 00000000000..0debf28b75e
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.js
@@ -0,0 +1,81 @@
+//// [keyofAndForIn.ts]
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+    const b = k in obj;
+    let k1: keyof T;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+//// [keyofAndForIn.js]
+// Repro from #12513
+function f1(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+function f2(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+function f3(obj, k) {
+    var b = k in obj;
+    var k1;
+    for (k1 in obj) {
+        var x1 = obj[k1];
+    }
+    for (var k2 in obj) {
+        var x2 = obj[k2];
+    }
+}
+
+
+//// [keyofAndForIn.d.ts]
+declare function f1<K extends string, T>(obj: {
+    [P in K]: T;
+}, k: K): void;
+declare function f2<T>(obj: {
+    [P in keyof T]: T[P];
+}, k: keyof T): void;
+declare function f3<T, K extends keyof T>(obj: {
+    [P in K]: T[P];
+}, k: K): void;
diff --git a/tests/baselines/reference/keyofAndForIn.symbols b/tests/baselines/reference/keyofAndForIn.symbols
new file mode 100644
index 00000000000..36b5d3e2d72
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.symbols
@@ -0,0 +1,125 @@
+=== tests/cases/conformance/types/keyof/keyofAndForIn.ts ===
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+>f1 : Symbol(f1, Decl(keyofAndForIn.ts, 0, 0))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 3, 29))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 3, 41))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 3, 29))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 3, 54))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 4, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 3, 54))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+    let k1: K;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 3, 12))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 7, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 5, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 9, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 10, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 3, 33))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 9, 12))
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+>f2 : Symbol(f2, Decl(keyofAndForIn.ts, 12, 1))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 14, 23))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 14, 23))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 14, 45))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 15, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 14, 45))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+    let k1: keyof T;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 14, 12))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 18, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 16, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 20, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 21, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 14, 15))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 20, 12))
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+>f3 : Symbol(f3, Decl(keyofAndForIn.ts, 23, 1))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 25, 42))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+>T : Symbol(T, Decl(keyofAndForIn.ts, 25, 12))
+>P : Symbol(P, Decl(keyofAndForIn.ts, 25, 42))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 25, 58))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+
+    const b = k in obj;
+>b : Symbol(b, Decl(keyofAndForIn.ts, 26, 9))
+>k : Symbol(k, Decl(keyofAndForIn.ts, 25, 58))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+    let k1: K;
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+>K : Symbol(K, Decl(keyofAndForIn.ts, 25, 14))
+
+    for (k1 in obj) {
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+        let x1 = obj[k1];
+>x1 : Symbol(x1, Decl(keyofAndForIn.ts, 29, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>k1 : Symbol(k1, Decl(keyofAndForIn.ts, 27, 7))
+    }
+    for (let k2 in obj) {
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 31, 12))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+
+        let x2 = obj[k2];
+>x2 : Symbol(x2, Decl(keyofAndForIn.ts, 32, 11))
+>obj : Symbol(obj, Decl(keyofAndForIn.ts, 25, 34))
+>k2 : Symbol(k2, Decl(keyofAndForIn.ts, 31, 12))
+    }
+}
diff --git a/tests/baselines/reference/keyofAndForIn.types b/tests/baselines/reference/keyofAndForIn.types
new file mode 100644
index 00000000000..5e992e5d261
--- /dev/null
+++ b/tests/baselines/reference/keyofAndForIn.types
@@ -0,0 +1,134 @@
+=== tests/cases/conformance/types/keyof/keyofAndForIn.ts ===
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+>f1 : <K extends string, T>(obj: { [P in K]: T; }, k: K) => void
+>K : K
+>T : T
+>obj : { [P in K]: T; }
+>P : P
+>K : K
+>T : T
+>k : K
+>K : K
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : K
+>obj : { [P in K]: T; }
+
+    let k1: K;
+>k1 : K
+>K : K
+
+    for (k1 in obj) {
+>k1 : K
+>obj : { [P in K]: T; }
+
+        let x1 = obj[k1];
+>x1 : T
+>obj[k1] : T
+>obj : { [P in K]: T; }
+>k1 : K
+    }
+    for (let k2 in obj) {
+>k2 : K
+>obj : { [P in K]: T; }
+
+        let x2 = obj[k2];
+>x2 : T
+>obj[k2] : T
+>obj : { [P in K]: T; }
+>k2 : K
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+>f2 : <T>(obj: { [P in keyof T]: T[P]; }, k: keyof T) => void
+>T : T
+>obj : { [P in keyof T]: T[P]; }
+>P : P
+>T : T
+>T : T
+>P : P
+>k : keyof T
+>T : T
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+    let k1: keyof T;
+>k1 : keyof T
+>T : T
+
+    for (k1 in obj) {
+>k1 : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+        let x1 = obj[k1];
+>x1 : T[keyof T]
+>obj[k1] : T[keyof T]
+>obj : { [P in keyof T]: T[P]; }
+>k1 : keyof T
+    }
+    for (let k2 in obj) {
+>k2 : keyof T
+>obj : { [P in keyof T]: T[P]; }
+
+        let x2 = obj[k2];
+>x2 : T[keyof T]
+>obj[k2] : T[keyof T]
+>obj : { [P in keyof T]: T[P]; }
+>k2 : keyof T
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+>f3 : <T, K extends keyof T>(obj: { [P in K]: T[P]; }, k: K) => void
+>T : T
+>K : K
+>T : T
+>obj : { [P in K]: T[P]; }
+>P : P
+>K : K
+>T : T
+>P : P
+>k : K
+>K : K
+
+    const b = k in obj;
+>b : boolean
+>k in obj : boolean
+>k : K
+>obj : { [P in K]: T[P]; }
+
+    let k1: K;
+>k1 : K
+>K : K
+
+    for (k1 in obj) {
+>k1 : K
+>obj : { [P in K]: T[P]; }
+
+        let x1 = obj[k1];
+>x1 : T[K]
+>obj[k1] : T[K]
+>obj : { [P in K]: T[P]; }
+>k1 : K
+    }
+    for (let k2 in obj) {
+>k2 : K
+>obj : { [P in K]: T[P]; }
+
+        let x2 = obj[k2];
+>x2 : T[K]
+>obj[k2] : T[K]
+>obj : { [P in K]: T[P]; }
+>k2 : K
+    }
+}
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.js b/tests/baselines/reference/keyofAndIndexedAccess.js
index dd59a5a1b4c..8d8f125f39e 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.js
+++ b/tests/baselines/reference/keyofAndIndexedAccess.js
@@ -21,11 +21,12 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
+type NumericallyIndexed<T> = { [x: number]: T };
 
 const enum E { A, B, C }
 
-type K00 = keyof any;  // string | number
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K00 = keyof any;  // string
+type K01 = keyof string;  // "toString" | "charAt" | ...
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 type K03 = keyof boolean;  // "valueOf"
 type K04 = keyof void;  // never
@@ -34,19 +35,20 @@ type K06 = keyof null;  // never
 type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+type K12 = keyof Dictionary<Shape>;  // string
 type K13 = keyof {};  // never
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 type K17 = keyof (Shape | Item);  // "name"
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
+type K19 = keyof NumericallyIndexed<Shape> // never
 
 type KeyOf<T> = keyof T;
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 
 type NAME = "name";
 type WIDTH_OR_HEIGHT = "width" | "height";
@@ -95,22 +97,18 @@ function f10(shape: Shape) {
 
 function f11(a: Shape[]) {
     let len = getProperty(a, "length");  // number
-    let shape = getProperty(a, 1000);    // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 
 function f12(t: [Shape, boolean]) {
     let len = getProperty(t, "length");
-    let s1 = getProperty(t, 0);    // Shape
     let s2 = getProperty(t, "0");  // Shape
-    let b1 = getProperty(t, 1);    // boolean
     let b2 = getProperty(t, "1");  // boolean
-    let x1 = getProperty(t, 2);    // Shape | boolean
 }
 
 function f13(foo: any, bar: any) {
     let x = getProperty(foo, "x");  // any
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
     let z = getProperty(foo, bar);  // any
 }
 
@@ -181,6 +179,46 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
+function f50<T>(k: keyof T, s: string) {
+    const x1 = s as keyof T;
+    const x2 = k as string;
+}
+
+function f51<T, K extends keyof T>(k: K, s: string) {
+    const x1 = s as keyof T;
+    const x2 = k as string;
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f54<T>(obj: T, key: keyof T) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f60<T>(source: T, target: T) {
+    for (let k in source) {
+        target[k] = source[k];
+    }
+}
+
 // Repros from #12011
 
 class Base {
@@ -211,7 +249,8 @@ class OtherPerson {
     getParts() {
         return getProperty(this, "parts")
     }
-}
+}
+
 
 //// [keyofAndIndexedAccess.js]
 var __extends = (this && this.__extends) || function (d, b) {
@@ -257,20 +296,16 @@ function f10(shape) {
 }
 function f11(a) {
     var len = getProperty(a, "length"); // number
-    var shape = getProperty(a, 1000); // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 function f12(t) {
     var len = getProperty(t, "length");
-    var s1 = getProperty(t, 0); // Shape
     var s2 = getProperty(t, "0"); // Shape
-    var b1 = getProperty(t, 1); // boolean
     var b2 = getProperty(t, "1"); // boolean
-    var x1 = getProperty(t, 2); // Shape | boolean
 }
 function f13(foo, bar) {
     var x = getProperty(foo, "x"); // any
-    var y = getProperty(foo, 100); // any
+    var y = getProperty(foo, "100"); // any
     var z = getProperty(foo, bar); // any
 }
 var Component = (function () {
@@ -329,6 +364,39 @@ function f40(c) {
     var y = c["y"];
     var z = c["z"];
 }
+function f50(k, s) {
+    var x1 = s;
+    var x2 = k;
+}
+function f51(k, s) {
+    var x1 = s;
+    var x2 = k;
+}
+function f52(obj, k, s, n) {
+    var x1 = obj[s];
+    var x2 = obj[n];
+    var x3 = obj[k];
+}
+function f53(obj, k, s, n) {
+    var x1 = obj[s];
+    var x2 = obj[n];
+    var x3 = obj[k];
+}
+function f54(obj, key) {
+    for (var s in obj[key]) {
+    }
+    var b = "foo" in obj[key];
+}
+function f55(obj, key) {
+    for (var s in obj[key]) {
+    }
+    var b = "foo" in obj[key];
+}
+function f60(source, target) {
+    for (var k in source) {
+        target[k] = source[k];
+    }
+}
 // Repros from #12011
 var Base = (function () {
     function Base() {
@@ -384,6 +452,9 @@ declare class Options {
 declare type Dictionary<T> = {
     [x: string]: T;
 };
+declare type NumericallyIndexed<T> = {
+    [x: number]: T;
+};
 declare const enum E {
     A = 0,
     B = 1,
@@ -406,6 +477,7 @@ declare type K15 = keyof E;
 declare type K16 = keyof [string, number];
 declare type K17 = keyof (Shape | Item);
 declare type K18 = keyof (Shape & Item);
+declare type K19 = keyof NumericallyIndexed<Shape>;
 declare type KeyOf<T> = keyof T;
 declare type K20 = KeyOf<Shape>;
 declare type K21 = KeyOf<Dictionary<Shape>>;
@@ -454,6 +526,17 @@ declare class C {
     private z;
 }
 declare function f40(c: C): void;
+declare function f50<T>(k: keyof T, s: string): void;
+declare function f51<T, K extends keyof T>(k: K, s: string): void;
+declare function f52<T>(obj: {
+    [x: string]: boolean;
+}, k: keyof T, s: string, n: number): void;
+declare function f53<T, K extends keyof T>(obj: {
+    [x: string]: boolean;
+}, k: K, s: string, n: number): void;
+declare function f54<T>(obj: T, key: keyof T): void;
+declare function f55<T, K extends keyof T>(obj: T, key: K): void;
+declare function f60<T>(source: T, target: T): void;
 declare class Base {
     get<K extends keyof this>(prop: K): this[K];
     set<K extends keyof this>(prop: K, value: this[K]): void;
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.symbols b/tests/baselines/reference/keyofAndIndexedAccess.symbols
index a76cf32b8d2..2371bf419c8 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.symbols
+++ b/tests/baselines/reference/keyofAndIndexedAccess.symbols
@@ -47,663 +47,804 @@ type Dictionary<T> = { [x: string]: T };
 >x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 21, 24))
 >T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 21, 16))
 
+type NumericallyIndexed<T> = { [x: number]: T };
+>NumericallyIndexed : Symbol(NumericallyIndexed, Decl(keyofAndIndexedAccess.ts, 21, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 22, 24))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 22, 32))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 22, 24))
+
 const enum E { A, B, C }
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 23, 14))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
->C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 23, 20))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 24, 14))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
+>C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 24, 20))
 
-type K00 = keyof any;  // string | number
->K00 : Symbol(K00, Decl(keyofAndIndexedAccess.ts, 23, 24))
+type K00 = keyof any;  // string
+>K00 : Symbol(K00, Decl(keyofAndIndexedAccess.ts, 24, 24))
 
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
->K01 : Symbol(K01, Decl(keyofAndIndexedAccess.ts, 25, 21))
+type K01 = keyof string;  // "toString" | "charAt" | ...
+>K01 : Symbol(K01, Decl(keyofAndIndexedAccess.ts, 26, 21))
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
->K02 : Symbol(K02, Decl(keyofAndIndexedAccess.ts, 26, 24))
+>K02 : Symbol(K02, Decl(keyofAndIndexedAccess.ts, 27, 24))
 
 type K03 = keyof boolean;  // "valueOf"
->K03 : Symbol(K03, Decl(keyofAndIndexedAccess.ts, 27, 24))
+>K03 : Symbol(K03, Decl(keyofAndIndexedAccess.ts, 28, 24))
 
 type K04 = keyof void;  // never
->K04 : Symbol(K04, Decl(keyofAndIndexedAccess.ts, 28, 25))
+>K04 : Symbol(K04, Decl(keyofAndIndexedAccess.ts, 29, 25))
 
 type K05 = keyof undefined;  // never
->K05 : Symbol(K05, Decl(keyofAndIndexedAccess.ts, 29, 22))
+>K05 : Symbol(K05, Decl(keyofAndIndexedAccess.ts, 30, 22))
 
 type K06 = keyof null;  // never
->K06 : Symbol(K06, Decl(keyofAndIndexedAccess.ts, 30, 27))
+>K06 : Symbol(K06, Decl(keyofAndIndexedAccess.ts, 31, 27))
 
 type K07 = keyof never;  // never
->K07 : Symbol(K07, Decl(keyofAndIndexedAccess.ts, 31, 22))
+>K07 : Symbol(K07, Decl(keyofAndIndexedAccess.ts, 32, 22))
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
->K10 : Symbol(K10, Decl(keyofAndIndexedAccess.ts, 32, 23))
+>K10 : Symbol(K10, Decl(keyofAndIndexedAccess.ts, 33, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
->K11 : Symbol(K11, Decl(keyofAndIndexedAccess.ts, 34, 23))
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+>K11 : Symbol(K11, Decl(keyofAndIndexedAccess.ts, 35, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K12 = keyof Dictionary<Shape>;  // string | number
->K12 : Symbol(K12, Decl(keyofAndIndexedAccess.ts, 35, 25))
+type K12 = keyof Dictionary<Shape>;  // string
+>K12 : Symbol(K12, Decl(keyofAndIndexedAccess.ts, 36, 25))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type K13 = keyof {};  // never
->K13 : Symbol(K13, Decl(keyofAndIndexedAccess.ts, 36, 35))
+>K13 : Symbol(K13, Decl(keyofAndIndexedAccess.ts, 37, 35))
 
 type K14 = keyof Object;  // "constructor" | "toString" | ...
->K14 : Symbol(K14, Decl(keyofAndIndexedAccess.ts, 37, 20))
+>K14 : Symbol(K14, Decl(keyofAndIndexedAccess.ts, 38, 20))
 >Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
->K15 : Symbol(K15, Decl(keyofAndIndexedAccess.ts, 38, 24))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
+>K15 : Symbol(K15, Decl(keyofAndIndexedAccess.ts, 39, 24))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
 
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
->K16 : Symbol(K16, Decl(keyofAndIndexedAccess.ts, 39, 19))
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
+>K16 : Symbol(K16, Decl(keyofAndIndexedAccess.ts, 40, 19))
 
 type K17 = keyof (Shape | Item);  // "name"
->K17 : Symbol(K17, Decl(keyofAndIndexedAccess.ts, 40, 34))
+>K17 : Symbol(K17, Decl(keyofAndIndexedAccess.ts, 41, 34))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Item : Symbol(Item, Decl(keyofAndIndexedAccess.ts, 10, 1))
 
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
->K18 : Symbol(K18, Decl(keyofAndIndexedAccess.ts, 41, 32))
+>K18 : Symbol(K18, Decl(keyofAndIndexedAccess.ts, 42, 32))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Item : Symbol(Item, Decl(keyofAndIndexedAccess.ts, 10, 1))
 
-type KeyOf<T> = keyof T;
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 44, 11))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 44, 11))
-
-type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
->K20 : Symbol(K20, Decl(keyofAndIndexedAccess.ts, 44, 24))
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
+type K19 = keyof NumericallyIndexed<Shape> // never
+>K19 : Symbol(K19, Decl(keyofAndIndexedAccess.ts, 43, 32))
+>NumericallyIndexed : Symbol(NumericallyIndexed, Decl(keyofAndIndexedAccess.ts, 21, 40))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
->K21 : Symbol(K21, Decl(keyofAndIndexedAccess.ts, 46, 24))
->KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 42, 32))
+type KeyOf<T> = keyof T;
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 46, 11))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 46, 11))
+
+type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
+>K20 : Symbol(K20, Decl(keyofAndIndexedAccess.ts, 46, 24))
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
+>Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
+
+type K21 = KeyOf<Dictionary<Shape>>;  // string
+>K21 : Symbol(K21, Decl(keyofAndIndexedAccess.ts, 48, 24))
+>KeyOf : Symbol(KeyOf, Decl(keyofAndIndexedAccess.ts, 44, 42))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type NAME = "name";
->NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 47, 36))
+>NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 49, 36))
 
 type WIDTH_OR_HEIGHT = "width" | "height";
->WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 49, 19))
+>WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 51, 19))
 
 type Q10 = Shape["name"];  // string
->Q10 : Symbol(Q10, Decl(keyofAndIndexedAccess.ts, 50, 42))
+>Q10 : Symbol(Q10, Decl(keyofAndIndexedAccess.ts, 52, 42))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q11 = Shape["width" | "height"];  // number
->Q11 : Symbol(Q11, Decl(keyofAndIndexedAccess.ts, 52, 25))
+>Q11 : Symbol(Q11, Decl(keyofAndIndexedAccess.ts, 54, 25))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q12 = Shape["name" | "visible"];  // string | boolean
->Q12 : Symbol(Q12, Decl(keyofAndIndexedAccess.ts, 53, 37))
+>Q12 : Symbol(Q12, Decl(keyofAndIndexedAccess.ts, 55, 37))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q20 = Shape[NAME];  // string
->Q20 : Symbol(Q20, Decl(keyofAndIndexedAccess.ts, 54, 37))
+>Q20 : Symbol(Q20, Decl(keyofAndIndexedAccess.ts, 56, 37))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 47, 36))
+>NAME : Symbol(NAME, Decl(keyofAndIndexedAccess.ts, 49, 36))
 
 type Q21 = Shape[WIDTH_OR_HEIGHT];  // number
->Q21 : Symbol(Q21, Decl(keyofAndIndexedAccess.ts, 56, 23))
+>Q21 : Symbol(Q21, Decl(keyofAndIndexedAccess.ts, 58, 23))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 49, 19))
+>WIDTH_OR_HEIGHT : Symbol(WIDTH_OR_HEIGHT, Decl(keyofAndIndexedAccess.ts, 51, 19))
 
 type Q30 = [string, number][0];  // string
->Q30 : Symbol(Q30, Decl(keyofAndIndexedAccess.ts, 57, 34))
+>Q30 : Symbol(Q30, Decl(keyofAndIndexedAccess.ts, 59, 34))
 
 type Q31 = [string, number][1];  // number
->Q31 : Symbol(Q31, Decl(keyofAndIndexedAccess.ts, 59, 31))
+>Q31 : Symbol(Q31, Decl(keyofAndIndexedAccess.ts, 61, 31))
 
 type Q32 = [string, number][2];  // string | number
->Q32 : Symbol(Q32, Decl(keyofAndIndexedAccess.ts, 60, 31))
+>Q32 : Symbol(Q32, Decl(keyofAndIndexedAccess.ts, 62, 31))
 
 type Q33 = [string, number][E.A];  // string
->Q33 : Symbol(Q33, Decl(keyofAndIndexedAccess.ts, 61, 31))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 23, 14))
+>Q33 : Symbol(Q33, Decl(keyofAndIndexedAccess.ts, 63, 31))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>A : Symbol(E.A, Decl(keyofAndIndexedAccess.ts, 24, 14))
 
 type Q34 = [string, number][E.B];  // number
->Q34 : Symbol(Q34, Decl(keyofAndIndexedAccess.ts, 62, 33))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
+>Q34 : Symbol(Q34, Decl(keyofAndIndexedAccess.ts, 64, 33))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
 
 type Q35 = [string, number][E.C];  // string | number
->Q35 : Symbol(Q35, Decl(keyofAndIndexedAccess.ts, 63, 33))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 23, 20))
+>Q35 : Symbol(Q35, Decl(keyofAndIndexedAccess.ts, 65, 33))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>C : Symbol(E.C, Decl(keyofAndIndexedAccess.ts, 24, 20))
 
 type Q36 = [string, number]["0"];  // string
->Q36 : Symbol(Q36, Decl(keyofAndIndexedAccess.ts, 64, 33))
+>Q36 : Symbol(Q36, Decl(keyofAndIndexedAccess.ts, 66, 33))
 
 type Q37 = [string, number]["1"];  // string
->Q37 : Symbol(Q37, Decl(keyofAndIndexedAccess.ts, 65, 33))
+>Q37 : Symbol(Q37, Decl(keyofAndIndexedAccess.ts, 67, 33))
 
 type Q40 = (Shape | Options)["visible"];  // boolean | "yes" | "no"
->Q40 : Symbol(Q40, Decl(keyofAndIndexedAccess.ts, 66, 33))
+>Q40 : Symbol(Q40, Decl(keyofAndIndexedAccess.ts, 68, 33))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Options : Symbol(Options, Decl(keyofAndIndexedAccess.ts, 15, 1))
 
 type Q41 = (Shape & Options)["visible"];  // true & "yes" | true & "no" | false & "yes" | false & "no"
->Q41 : Symbol(Q41, Decl(keyofAndIndexedAccess.ts, 68, 40))
+>Q41 : Symbol(Q41, Decl(keyofAndIndexedAccess.ts, 70, 40))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 >Options : Symbol(Options, Decl(keyofAndIndexedAccess.ts, 15, 1))
 
 type Q50 = Dictionary<Shape>["howdy"];  // Shape
->Q50 : Symbol(Q50, Decl(keyofAndIndexedAccess.ts, 69, 40))
+>Q50 : Symbol(Q50, Decl(keyofAndIndexedAccess.ts, 71, 40))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q51 = Dictionary<Shape>[123];  // Shape
->Q51 : Symbol(Q51, Decl(keyofAndIndexedAccess.ts, 71, 38))
+>Q51 : Symbol(Q51, Decl(keyofAndIndexedAccess.ts, 73, 38))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
 type Q52 = Dictionary<Shape>[E.B];  // Shape
->Q52 : Symbol(Q52, Decl(keyofAndIndexedAccess.ts, 72, 34))
+>Q52 : Symbol(Q52, Decl(keyofAndIndexedAccess.ts, 74, 34))
 >Dictionary : Symbol(Dictionary, Decl(keyofAndIndexedAccess.ts, 19, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 21, 40))
->B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 23, 17))
+>E : Symbol(E, Decl(keyofAndIndexedAccess.ts, 22, 48))
+>B : Symbol(E.B, Decl(keyofAndIndexedAccess.ts, 24, 17))
 
 declare let cond: boolean;
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
 function getProperty<T, K extends keyof T>(obj: T, key: K) {
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 77, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 77, 43))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 77, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 77, 50))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 77, 23))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 79, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 79, 43))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 79, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 79, 50))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 79, 23))
 
     return obj[key];
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 77, 43))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 77, 50))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 79, 43))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 79, 50))
 }
 
 function setProperty<T, K extends keyof T>(obj: T, key: K, value: T[K]) {
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 81, 43))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 81, 50))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 81, 58))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 81, 21))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 81, 23))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 83, 43))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 83, 50))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 83, 58))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 83, 21))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 83, 23))
 
     obj[key] = value;
->obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 81, 43))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 81, 50))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 81, 58))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 83, 43))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 83, 50))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 83, 58))
 }
 
 function f10(shape: Shape) {
->f10 : Symbol(f10, Decl(keyofAndIndexedAccess.ts, 83, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>f10 : Symbol(f10, Decl(keyofAndIndexedAccess.ts, 85, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let name = getProperty(shape, "name");  // string
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 86, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 88, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 
     let widthOrHeight = getProperty(shape, cond ? "width" : "height");  // number
->widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 87, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 89, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     let nameOrVisible = getProperty(shape, cond ? "name" : "visible");  // string | boolean
->nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 88, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 90, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     setProperty(shape, "name", "rectangle");
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
 
     setProperty(shape, cond ? "width" : "height", 10);
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     setProperty(shape, cond ? "name" : "visible", true);  // Technically not safe
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 85, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 87, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function f11(a: Shape[]) {
->f11 : Symbol(f11, Decl(keyofAndIndexedAccess.ts, 92, 1))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+>f11 : Symbol(f11, Decl(keyofAndIndexedAccess.ts, 94, 1))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let len = getProperty(a, "length");  // number
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 95, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 97, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
 
-    let shape = getProperty(a, 1000);    // Shape
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 96, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
-
-    setProperty(a, 1000, getProperty(a, 1001));
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 94, 13))
+    setProperty(a, "length", len);
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>a : Symbol(a, Decl(keyofAndIndexedAccess.ts, 96, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 97, 7))
 }
 
 function f12(t: [Shape, boolean]) {
->f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 98, 1))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>f12 : Symbol(f12, Decl(keyofAndIndexedAccess.ts, 99, 1))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let len = getProperty(t, "length");
->len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 101, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let s1 = getProperty(t, 0);    // Shape
->s1 : Symbol(s1, Decl(keyofAndIndexedAccess.ts, 102, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>len : Symbol(len, Decl(keyofAndIndexedAccess.ts, 102, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 
     let s2 = getProperty(t, "0");  // Shape
 >s2 : Symbol(s2, Decl(keyofAndIndexedAccess.ts, 103, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let b1 = getProperty(t, 1);    // boolean
->b1 : Symbol(b1, Decl(keyofAndIndexedAccess.ts, 104, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 
     let b2 = getProperty(t, "1");  // boolean
->b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 105, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
-
-    let x1 = getProperty(t, 2);    // Shape | boolean
->x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 106, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 100, 13))
+>b2 : Symbol(b2, Decl(keyofAndIndexedAccess.ts, 104, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>t : Symbol(t, Decl(keyofAndIndexedAccess.ts, 101, 13))
 }
 
 function f13(foo: any, bar: any) {
->f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 107, 1))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 109, 22))
+>f13 : Symbol(f13, Decl(keyofAndIndexedAccess.ts, 105, 1))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 107, 22))
 
     let x = getProperty(foo, "x");  // any
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 110, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 108, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
 
-    let y = getProperty(foo, 100);  // any
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 111, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
+    let y = getProperty(foo, "100");  // any
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 109, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
 
     let z = getProperty(foo, bar);  // any
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 112, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 109, 13))
->bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 109, 22))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 110, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>foo : Symbol(foo, Decl(keyofAndIndexedAccess.ts, 107, 13))
+>bar : Symbol(bar, Decl(keyofAndIndexedAccess.ts, 107, 22))
 }
 
 class Component<PropType> {
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
 
     props: PropType;
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
 
     getProperty<K extends keyof PropType>(key: K) {
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 117, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 117, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 117, 16))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 115, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 115, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 115, 16))
 
         return this.props[key];
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 117, 42))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 115, 42))
     }
     setProperty<K extends keyof PropType>(key: K, value: PropType[K]) {
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 120, 42))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 120, 49))
->PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 115, 16))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 120, 16))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 118, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 118, 49))
+>PropType : Symbol(PropType, Decl(keyofAndIndexedAccess.ts, 113, 16))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 118, 16))
 
         this.props[key] = value;
->this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
->props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 115, 27))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 120, 42))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 120, 49))
+>this.props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>this : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
+>props : Symbol(Component.props, Decl(keyofAndIndexedAccess.ts, 113, 27))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 118, 42))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 118, 49))
     }
 }
 
 function f20(component: Component<Shape>) {
->f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 123, 1))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 113, 1))
+>f20 : Symbol(f20, Decl(keyofAndIndexedAccess.ts, 121, 1))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>Component : Symbol(Component, Decl(keyofAndIndexedAccess.ts, 111, 1))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let name = component.getProperty("name");  // string
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 126, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 124, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
 
     let widthOrHeight = component.getProperty(cond ? "width" : "height");  // number
->widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 127, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>widthOrHeight : Symbol(widthOrHeight, Decl(keyofAndIndexedAccess.ts, 125, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     let nameOrVisible = component.getProperty(cond ? "name" : "visible");  // string | boolean
->nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 128, 7))
->component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 116, 20))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisible : Symbol(nameOrVisible, Decl(keyofAndIndexedAccess.ts, 126, 7))
+>component.getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>getProperty : Symbol(Component.getProperty, Decl(keyofAndIndexedAccess.ts, 114, 20))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     component.setProperty("name", "rectangle");
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
 
     component.setProperty(cond ? "width" : "height", 10)
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 
     component.setProperty(cond ? "name" : "visible", true);  // Technically not safe
->component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 125, 13))
->setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 119, 5))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>component.setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>component : Symbol(component, Decl(keyofAndIndexedAccess.ts, 123, 13))
+>setProperty : Symbol(Component.setProperty, Decl(keyofAndIndexedAccess.ts, 117, 5))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function pluck<T, K extends keyof T>(array: T[], key: K) {
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 134, 17))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 134, 37))
->T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 134, 15))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 134, 48))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 134, 17))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 132, 17))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 132, 37))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 132, 15))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 132, 48))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 132, 17))
 
     return array.map(x => x[key]);
 >array.map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 134, 37))
+>array : Symbol(array, Decl(keyofAndIndexedAccess.ts, 132, 37))
 >map : Symbol(Array.map, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 135, 21))
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 135, 21))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 134, 48))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 133, 21))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 133, 21))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 132, 48))
 }
 
 function f30(shapes: Shape[]) {
->f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 136, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>f30 : Symbol(f30, Decl(keyofAndIndexedAccess.ts, 134, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
 
     let names = pluck(shapes, "name");    // string[]
->names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 139, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>names : Symbol(names, Decl(keyofAndIndexedAccess.ts, 137, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 
     let widths = pluck(shapes, "width");  // number[]
->widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 140, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
+>widths : Symbol(widths, Decl(keyofAndIndexedAccess.ts, 138, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
 
     let nameOrVisibles = pluck(shapes, cond ? "name" : "visible");  // (string | boolean)[]
->nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 141, 7))
->pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 132, 1))
->shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 138, 13))
->cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 75, 11))
+>nameOrVisibles : Symbol(nameOrVisibles, Decl(keyofAndIndexedAccess.ts, 139, 7))
+>pluck : Symbol(pluck, Decl(keyofAndIndexedAccess.ts, 130, 1))
+>shapes : Symbol(shapes, Decl(keyofAndIndexedAccess.ts, 136, 13))
+>cond : Symbol(cond, Decl(keyofAndIndexedAccess.ts, 77, 11))
 }
 
 function f31<K extends keyof Shape>(key: K) {
->f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 142, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 144, 13))
+>f31 : Symbol(f31, Decl(keyofAndIndexedAccess.ts, 140, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 142, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 144, 36))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 144, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 142, 36))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 142, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 145, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 143, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 145, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 145, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 145, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 145, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 143, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 143, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 143, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 143, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 145, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 144, 36))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 143, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 142, 36))
 }
 
 function f32<K extends "width" | "height">(key: K) {
->f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 147, 1))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 149, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 149, 43))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 149, 13))
+>f32 : Symbol(f32, Decl(keyofAndIndexedAccess.ts, 145, 1))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 147, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 147, 43))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 147, 13))
 
     const shape: Shape = { name: "foo", width: 5, height: 10, visible: true };
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 9))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 148, 9))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 150, 26))
->width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 150, 39))
->height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 150, 49))
->visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 150, 61))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 148, 26))
+>width : Symbol(width, Decl(keyofAndIndexedAccess.ts, 148, 39))
+>height : Symbol(height, Decl(keyofAndIndexedAccess.ts, 148, 49))
+>visible : Symbol(visible, Decl(keyofAndIndexedAccess.ts, 148, 61))
 
     return shape[key];  // Shape[K]
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 150, 9))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 149, 43))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 148, 9))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 147, 43))
 }
 
 function f33<S extends Shape, K extends keyof S>(shape: S, key: K) {
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 152, 1))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 150, 1))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
 >Shape : Symbol(Shape, Decl(keyofAndIndexedAccess.ts, 0, 0))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 154, 29))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
->S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 154, 13))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 154, 58))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 154, 29))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 152, 29))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
+>S : Symbol(S, Decl(keyofAndIndexedAccess.ts, 152, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 152, 58))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 152, 29))
 
     let name = getProperty(shape, "name");
->name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 155, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
+>name : Symbol(name, Decl(keyofAndIndexedAccess.ts, 153, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
 
     let prop = getProperty(shape, key);
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 156, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 154, 49))
->key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 154, 58))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 154, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>shape : Symbol(shape, Decl(keyofAndIndexedAccess.ts, 152, 49))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 152, 58))
 
     return prop;
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 156, 7))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 154, 7))
 }
 
 function f34(ts: TaggedShape) {
->f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 158, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>f34 : Symbol(f34, Decl(keyofAndIndexedAccess.ts, 156, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 >TaggedShape : Symbol(TaggedShape, Decl(keyofAndIndexedAccess.ts, 6, 1))
 
     let tag1 = f33(ts, "tag");
->tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 161, 7))
->f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 152, 1))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>tag1 : Symbol(tag1, Decl(keyofAndIndexedAccess.ts, 159, 7))
+>f33 : Symbol(f33, Decl(keyofAndIndexedAccess.ts, 150, 1))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 
     let tag2 = getProperty(ts, "tag");
->tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 162, 7))
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 160, 13))
+>tag2 : Symbol(tag2, Decl(keyofAndIndexedAccess.ts, 160, 7))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>ts : Symbol(ts, Decl(keyofAndIndexedAccess.ts, 158, 13))
 }
 
 class C {
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     public x: string;
->x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 165, 9))
+>x : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 163, 9))
 
     protected y: string;
->y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 166, 21))
+>y : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 164, 21))
 
     private z: string;
->z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 167, 24))
+>z : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 165, 24))
 }
 
 // Indexed access expressions have always permitted access to private and protected members.
 // For consistency we also permit such access in indexed access types.
 function f40(c: C) {
->f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 169, 1))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>f40 : Symbol(f40, Decl(keyofAndIndexedAccess.ts, 167, 1))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type X = C["x"];
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 173, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type Y = C["y"];
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 174, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 172, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     type Z = C["z"];
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 175, 20))
->C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 163, 1))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 173, 20))
+>C : Symbol(C, Decl(keyofAndIndexedAccess.ts, 161, 1))
 
     let x: X = c["x"];
->x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 177, 7))
->X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 173, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 165, 9))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 175, 7))
+>X : Symbol(X, Decl(keyofAndIndexedAccess.ts, 171, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"x" : Symbol(C.x, Decl(keyofAndIndexedAccess.ts, 163, 9))
 
     let y: Y = c["y"];
->y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 178, 7))
->Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 174, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 166, 21))
+>y : Symbol(y, Decl(keyofAndIndexedAccess.ts, 176, 7))
+>Y : Symbol(Y, Decl(keyofAndIndexedAccess.ts, 172, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"y" : Symbol(C.y, Decl(keyofAndIndexedAccess.ts, 164, 21))
 
     let z: Z = c["z"];
->z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 179, 7))
->Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 175, 20))
->c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 173, 13))
->"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 167, 24))
+>z : Symbol(z, Decl(keyofAndIndexedAccess.ts, 177, 7))
+>Z : Symbol(Z, Decl(keyofAndIndexedAccess.ts, 173, 20))
+>c : Symbol(c, Decl(keyofAndIndexedAccess.ts, 171, 13))
+>"z" : Symbol(C.z, Decl(keyofAndIndexedAccess.ts, 165, 24))
+}
+
+function f50<T>(k: keyof T, s: string) {
+>f50 : Symbol(f50, Decl(keyofAndIndexedAccess.ts, 178, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 180, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 180, 27))
+
+    const x1 = s as keyof T;
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 181, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 180, 27))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 180, 13))
+
+    const x2 = k as string;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 182, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 180, 16))
+}
+
+function f51<T, K extends keyof T>(k: K, s: string) {
+>f51 : Symbol(f51, Decl(keyofAndIndexedAccess.ts, 183, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 185, 35))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 185, 40))
+
+    const x1 = s as keyof T;
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 186, 9))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 185, 40))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 185, 13))
+
+    const x2 = k as string;
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 187, 9))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 185, 35))
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+>f52 : Symbol(f52, Decl(keyofAndIndexedAccess.ts, 188, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 190, 24))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 46))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 190, 13))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 58))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 69))
+
+    const x1 = obj[s];
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 191, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 190, 58))
+
+    const x2 = obj[n];
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 192, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 190, 69))
+
+    const x3 = obj[k];
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 193, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 190, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 190, 46))
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+>f53 : Symbol(f53, Decl(keyofAndIndexedAccess.ts, 194, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 196, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 196, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 196, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>x : Symbol(x, Decl(keyofAndIndexedAccess.ts, 196, 43))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 196, 65))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 196, 15))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 196, 71))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 196, 82))
+
+    const x1 = obj[s];
+>x1 : Symbol(x1, Decl(keyofAndIndexedAccess.ts, 197, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 196, 71))
+
+    const x2 = obj[n];
+>x2 : Symbol(x2, Decl(keyofAndIndexedAccess.ts, 198, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>n : Symbol(n, Decl(keyofAndIndexedAccess.ts, 196, 82))
+
+    const x3 = obj[k];
+>x3 : Symbol(x3, Decl(keyofAndIndexedAccess.ts, 199, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 196, 35))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 196, 65))
+}
+
+function f54<T>(obj: T, key: keyof T) {
+>f54 : Symbol(f54, Decl(keyofAndIndexedAccess.ts, 200, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 202, 13))
+
+    for (let s in obj[key]) {
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 203, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
+    }
+    const b = "foo" in obj[key];
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 205, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 202, 16))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 202, 23))
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+>f55 : Symbol(f55, Decl(keyofAndIndexedAccess.ts, 206, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 208, 15))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 208, 13))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 208, 15))
+
+    for (let s in obj[key]) {
+>s : Symbol(s, Decl(keyofAndIndexedAccess.ts, 209, 12))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
+    }
+    const b = "foo" in obj[key];
+>b : Symbol(b, Decl(keyofAndIndexedAccess.ts, 211, 9))
+>obj : Symbol(obj, Decl(keyofAndIndexedAccess.ts, 208, 35))
+>key : Symbol(key, Decl(keyofAndIndexedAccess.ts, 208, 42))
+}
+
+function f60<T>(source: T, target: T) {
+>f60 : Symbol(f60, Decl(keyofAndIndexedAccess.ts, 212, 1))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 214, 26))
+>T : Symbol(T, Decl(keyofAndIndexedAccess.ts, 214, 13))
+
+    for (let k in source) {
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
+
+        target[k] = source[k];
+>target : Symbol(target, Decl(keyofAndIndexedAccess.ts, 214, 26))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
+>source : Symbol(source, Decl(keyofAndIndexedAccess.ts, 214, 16))
+>k : Symbol(k, Decl(keyofAndIndexedAccess.ts, 215, 12))
+    }
 }
 
 // Repros from #12011
 
 class Base {
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
     get<K extends keyof this>(prop: K) {
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 185, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 185, 8))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 223, 8))
 
         return this[prop];
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 185, 30))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 223, 30))
     }
     set<K extends keyof this>(prop: K, value: this[K]) {
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 188, 30))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 188, 38))
->K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 188, 8))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
+>K : Symbol(K, Decl(keyofAndIndexedAccess.ts, 226, 8))
 
         this[prop] = value;
->this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
->prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 188, 30))
->value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 188, 38))
+>this : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
+>prop : Symbol(prop, Decl(keyofAndIndexedAccess.ts, 226, 30))
+>value : Symbol(value, Decl(keyofAndIndexedAccess.ts, 226, 38))
     }
 }
 
 class Person extends Base {
->Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>Person : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>Base : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
     parts: number;
->parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 193, 27))
+>parts : Symbol(Person.parts, Decl(keyofAndIndexedAccess.ts, 231, 27))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 195, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
 
         super();
->super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 180, 1))
+>super : Symbol(Base, Decl(keyofAndIndexedAccess.ts, 218, 1))
 
         this.set("parts", parts);
->this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 187, 5))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 195, 16))
+>this.set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>set : Symbol(Base.set, Decl(keyofAndIndexedAccess.ts, 225, 5))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 233, 16))
     }
     getParts() {
->getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 198, 5))
+>getParts : Symbol(Person.getParts, Decl(keyofAndIndexedAccess.ts, 236, 5))
 
         return this.get("parts")
->this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
->this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 191, 1))
->get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 184, 12))
+>this.get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
+>this : Symbol(Person, Decl(keyofAndIndexedAccess.ts, 229, 1))
+>get : Symbol(Base.get, Decl(keyofAndIndexedAccess.ts, 222, 12))
     }
 }
 
 class OtherPerson {
->OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
+>OtherPerson : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
 
     parts: number;
->parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 204, 19))
+>parts : Symbol(OtherPerson.parts, Decl(keyofAndIndexedAccess.ts, 242, 19))
 
     constructor(parts: number) {
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 206, 16))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
 
         setProperty(this, "parts", parts);
->setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 79, 1))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
->parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 206, 16))
+>setProperty : Symbol(setProperty, Decl(keyofAndIndexedAccess.ts, 81, 1))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
+>parts : Symbol(parts, Decl(keyofAndIndexedAccess.ts, 244, 16))
     }
     getParts() {
->getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 208, 5))
+>getParts : Symbol(OtherPerson.getParts, Decl(keyofAndIndexedAccess.ts, 246, 5))
 
         return getProperty(this, "parts")
->getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 75, 26))
->this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 202, 1))
+>getProperty : Symbol(getProperty, Decl(keyofAndIndexedAccess.ts, 77, 26))
+>this : Symbol(OtherPerson, Decl(keyofAndIndexedAccess.ts, 240, 1))
     }
 }
+
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index c252ea4e2bd..587100496e9 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -47,17 +47,23 @@ type Dictionary<T> = { [x: string]: T };
 >x : string
 >T : T
 
+type NumericallyIndexed<T> = { [x: number]: T };
+>NumericallyIndexed : NumericallyIndexed<T>
+>T : T
+>x : number
+>T : T
+
 const enum E { A, B, C }
 >E : E
 >A : E.A
 >B : E.B
 >C : E.C
 
-type K00 = keyof any;  // string | number
->K00 : string | number
+type K00 = keyof any;  // string
+>K00 : string
 
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
->K01 : number | "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
+type K01 = keyof string;  // "toString" | "charAt" | ...
+>K01 : "length" | "toString" | "concat" | "slice" | "indexOf" | "lastIndexOf" | "charAt" | "charCodeAt" | "localeCompare" | "match" | "replace" | "search" | "split" | "substring" | "toLowerCase" | "toLocaleLowerCase" | "toUpperCase" | "toLocaleUpperCase" | "trim" | "substr" | "valueOf"
 
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 >K02 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
@@ -82,12 +88,12 @@ type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
 >K10 : "name" | "width" | "height" | "visible"
 >Shape : Shape
 
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
->K11 : number | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+>K11 : "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 >Shape : Shape
 
-type K12 = keyof Dictionary<Shape>;  // string | number
->K12 : string | number
+type K12 = keyof Dictionary<Shape>;  // string
+>K12 : string
 >Dictionary : Dictionary<T>
 >Shape : Shape
 
@@ -102,8 +108,8 @@ type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
 >K15 : "toString" | "toLocaleString" | "valueOf" | "toFixed" | "toExponential" | "toPrecision"
 >E : E
 
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
->K16 : number | "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
+>K16 : "0" | "1" | "length" | "toString" | "toLocaleString" | "push" | "pop" | "concat" | "join" | "reverse" | "shift" | "slice" | "sort" | "splice" | "unshift" | "indexOf" | "lastIndexOf" | "every" | "some" | "forEach" | "map" | "filter" | "reduce" | "reduceRight"
 
 type K17 = keyof (Shape | Item);  // "name"
 >K17 : "name"
@@ -115,6 +121,11 @@ type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "
 >Shape : Shape
 >Item : Item
 
+type K19 = keyof NumericallyIndexed<Shape> // never
+>K19 : never
+>NumericallyIndexed : NumericallyIndexed<T>
+>Shape : Shape
+
 type KeyOf<T> = keyof T;
 >KeyOf : keyof T
 >T : T
@@ -125,8 +136,8 @@ type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
 >KeyOf : keyof T
 >Shape : Shape
 
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
->K21 : string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
+>K21 : string
 >KeyOf : keyof T
 >Dictionary : Dictionary<T>
 >Shape : Shape
@@ -328,22 +339,12 @@ function f11(a: Shape[]) {
 >a : Shape[]
 >"length" : "length"
 
-    let shape = getProperty(a, 1000);    // Shape
->shape : Shape
->getProperty(a, 1000) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->a : Shape[]
->1000 : 1000
-
-    setProperty(a, 1000, getProperty(a, 1001));
->setProperty(a, 1000, getProperty(a, 1001)) : void
+    setProperty(a, "length", len);
+>setProperty(a, "length", len) : void
 >setProperty : <T, K extends keyof T>(obj: T, key: K, value: T[K]) => void
 >a : Shape[]
->1000 : 1000
->getProperty(a, 1001) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->a : Shape[]
->1001 : 1001
+>"length" : "length"
+>len : number
 }
 
 function f12(t: [Shape, boolean]) {
@@ -358,13 +359,6 @@ function f12(t: [Shape, boolean]) {
 >t : [Shape, boolean]
 >"length" : "length"
 
-    let s1 = getProperty(t, 0);    // Shape
->s1 : Shape
->getProperty(t, 0) : Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->0 : 0
-
     let s2 = getProperty(t, "0");  // Shape
 >s2 : Shape
 >getProperty(t, "0") : Shape
@@ -372,26 +366,12 @@ function f12(t: [Shape, boolean]) {
 >t : [Shape, boolean]
 >"0" : "0"
 
-    let b1 = getProperty(t, 1);    // boolean
->b1 : boolean
->getProperty(t, 1) : boolean
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->1 : 1
-
     let b2 = getProperty(t, "1");  // boolean
 >b2 : boolean
 >getProperty(t, "1") : boolean
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
 >t : [Shape, boolean]
 >"1" : "1"
-
-    let x1 = getProperty(t, 2);    // Shape | boolean
->x1 : boolean | Shape
->getProperty(t, 2) : boolean | Shape
->getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
->t : [Shape, boolean]
->2 : 2
 }
 
 function f13(foo: any, bar: any) {
@@ -406,12 +386,12 @@ function f13(foo: any, bar: any) {
 >foo : any
 >"x" : "x"
 
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
 >y : any
->getProperty(foo, 100) : any
+>getProperty(foo, "100") : any
 >getProperty : <T, K extends keyof T>(obj: T, key: K) => T[K]
 >foo : any
->100 : 100
+>"100" : "100"
 
     let z = getProperty(foo, bar);  // any
 >z : any
@@ -737,6 +717,177 @@ function f40(c: C) {
 >"z" : "z"
 }
 
+function f50<T>(k: keyof T, s: string) {
+>f50 : <T>(k: keyof T, s: string) => void
+>T : T
+>k : keyof T
+>T : T
+>s : string
+
+    const x1 = s as keyof T;
+>x1 : keyof T
+>s as keyof T : keyof T
+>s : string
+>T : T
+
+    const x2 = k as string;
+>x2 : string
+>k as string : string
+>k : keyof T
+}
+
+function f51<T, K extends keyof T>(k: K, s: string) {
+>f51 : <T, K extends keyof T>(k: K, s: string) => void
+>T : T
+>K : K
+>T : T
+>k : K
+>K : K
+>s : string
+
+    const x1 = s as keyof T;
+>x1 : keyof T
+>s as keyof T : keyof T
+>s : string
+>T : T
+
+    const x2 = k as string;
+>x2 : string
+>k as string : string
+>k : K
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+>f52 : <T>(obj: { [x: string]: boolean; }, k: keyof T, s: string, n: number) => void
+>T : T
+>obj : { [x: string]: boolean; }
+>x : string
+>k : keyof T
+>T : T
+>s : string
+>n : number
+
+    const x1 = obj[s];
+>x1 : boolean
+>obj[s] : boolean
+>obj : { [x: string]: boolean; }
+>s : string
+
+    const x2 = obj[n];
+>x2 : boolean
+>obj[n] : boolean
+>obj : { [x: string]: boolean; }
+>n : number
+
+    const x3 = obj[k];
+>x3 : boolean
+>obj[k] : boolean
+>obj : { [x: string]: boolean; }
+>k : keyof T
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+>f53 : <T, K extends keyof T>(obj: { [x: string]: boolean; }, k: K, s: string, n: number) => void
+>T : T
+>K : K
+>T : T
+>obj : { [x: string]: boolean; }
+>x : string
+>k : K
+>K : K
+>s : string
+>n : number
+
+    const x1 = obj[s];
+>x1 : boolean
+>obj[s] : boolean
+>obj : { [x: string]: boolean; }
+>s : string
+
+    const x2 = obj[n];
+>x2 : boolean
+>obj[n] : boolean
+>obj : { [x: string]: boolean; }
+>n : number
+
+    const x3 = obj[k];
+>x3 : { [x: string]: boolean; }[K]
+>obj[k] : { [x: string]: boolean; }[K]
+>obj : { [x: string]: boolean; }
+>k : K
+}
+
+function f54<T>(obj: T, key: keyof T) {
+>f54 : <T>(obj: T, key: keyof T) => void
+>T : T
+>obj : T
+>T : T
+>key : keyof T
+>T : T
+
+    for (let s in obj[key]) {
+>s : string
+>obj[key] : T[keyof T]
+>obj : T
+>key : keyof T
+    }
+    const b = "foo" in obj[key];
+>b : boolean
+>"foo" in obj[key] : boolean
+>"foo" : "foo"
+>obj[key] : T[keyof T]
+>obj : T
+>key : keyof T
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+>f55 : <T, K extends keyof T>(obj: T, key: K) => void
+>T : T
+>K : K
+>T : T
+>obj : T
+>T : T
+>key : K
+>K : K
+
+    for (let s in obj[key]) {
+>s : string
+>obj[key] : T[K]
+>obj : T
+>key : K
+    }
+    const b = "foo" in obj[key];
+>b : boolean
+>"foo" in obj[key] : boolean
+>"foo" : "foo"
+>obj[key] : T[K]
+>obj : T
+>key : K
+}
+
+function f60<T>(source: T, target: T) {
+>f60 : <T>(source: T, target: T) => void
+>T : T
+>source : T
+>T : T
+>target : T
+>T : T
+
+    for (let k in source) {
+>k : keyof T
+>source : T
+
+        target[k] = source[k];
+>target[k] = source[k] : T[keyof T]
+>target[k] : T[keyof T]
+>target : T
+>k : keyof T
+>source[k] : T[keyof T]
+>source : T
+>k : keyof T
+    }
+}
+
 // Repros from #12011
 
 class Base {
@@ -830,3 +981,4 @@ class OtherPerson {
 >"parts" : "parts"
     }
 }
+
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
new file mode 100644
index 00000000000..8424d528b22
--- /dev/null
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.errors.txt
@@ -0,0 +1,32 @@
+tests/cases/compiler/keyofIsLiteralContexualType.ts(5,9): error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type 'keyof T[]'.
+  Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
+    Type '"a" | "b" | "c"' is not assignable to type '"a" | "b"'.
+      Type '"c"' is not assignable to type '"a" | "b"'.
+        Type '"c"' is not assignable to type 'keyof T'.
+          Type '"c"' is not assignable to type '"a" | "b"'.
+tests/cases/compiler/keyofIsLiteralContexualType.ts(13,11): error TS2339: Property 'b' does not exist on type 'Pick<{ a: number; b: number; c: number; }, "a" | "c">'.
+
+
+==== tests/cases/compiler/keyofIsLiteralContexualType.ts (2 errors) ====
+    // keyof T is a literal contextual type
+    
+    function foo<T extends { a: string, b: string }>() {
+        let a: (keyof T)[] = ["a", "b"];
+        let b: (keyof T)[] = ["a", "b", "c"];
+            ~
+!!! error TS2322: Type '("a" | "b" | "c")[]' is not assignable to type 'keyof T[]'.
+!!! error TS2322:   Type '"a" | "b" | "c"' is not assignable to type 'keyof T'.
+!!! error TS2322:     Type '"a" | "b" | "c"' is not assignable to type '"a" | "b"'.
+!!! error TS2322:       Type '"c"' is not assignable to type '"a" | "b"'.
+!!! error TS2322:         Type '"c"' is not assignable to type 'keyof T'.
+!!! error TS2322:           Type '"c"' is not assignable to type '"a" | "b"'.
+    }
+    
+    // Repro from #12455
+    
+    declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+    
+    let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+    let b = x.b;  // Error
+              ~
+!!! error TS2339: Property 'b' does not exist on type 'Pick<{ a: number; b: number; c: number; }, "a" | "c">'.
\ No newline at end of file
diff --git a/tests/baselines/reference/keyofIsLiteralContexualType.js b/tests/baselines/reference/keyofIsLiteralContexualType.js
new file mode 100644
index 00000000000..5325b976174
--- /dev/null
+++ b/tests/baselines/reference/keyofIsLiteralContexualType.js
@@ -0,0 +1,23 @@
+//// [keyofIsLiteralContexualType.ts]
+// keyof T is a literal contextual type
+
+function foo<T extends { a: string, b: string }>() {
+    let a: (keyof T)[] = ["a", "b"];
+    let b: (keyof T)[] = ["a", "b", "c"];
+}
+
+// Repro from #12455
+
+declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+
+let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+let b = x.b;  // Error
+
+//// [keyofIsLiteralContexualType.js]
+// keyof T is a literal contextual type
+function foo() {
+    var a = ["a", "b"];
+    var b = ["a", "b", "c"];
+}
+var x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+var b = x.b; // Error
diff --git a/tests/baselines/reference/mappedTypeErrors.errors.txt b/tests/baselines/reference/mappedTypeErrors.errors.txt
index 0e1198285ba..945652bf929 100644
--- a/tests/baselines/reference/mappedTypeErrors.errors.txt
+++ b/tests/baselines/reference/mappedTypeErrors.errors.txt
@@ -1,29 +1,28 @@
 tests/cases/conformance/types/mapped/mappedTypeErrors.ts(20,20): error TS2313: Type parameter 'P' has a circular constraint.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'Date' is not assignable to type 'string | number'.
-  Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,19): error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
-  Type 'Date' is not assignable to type 'number'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(25,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(21,20): error TS2322: Type 'number' is not assignable to type 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(22,20): error TS2322: Type 'Date' is not assignable to type 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(23,19): error TS2344: Type 'Date' does not satisfy the constraint 'string'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(26,24): error TS2344: Type '"foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(27,24): error TS2344: Type '"name" | "foo"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"foo"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(28,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(29,24): error TS2344: Type '"x" | "y"' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type '"x"' is not assignable to type '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(30,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(33,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(31,24): error TS2344: Type 'undefined' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(34,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'T' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(37,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(38,24): error TS2344: Type 'T' does not satisfy the constraint '"name" | "width" | "height" | "visible"'.
   Type 'string | number' is not assignable to type '"name" | "width" | "height" | "visible"'.
     Type 'string' is not assignable to type '"name" | "width" | "height" | "visible"'.
       Type 'T' is not assignable to type '"visible"'.
         Type 'string | number' is not assignable to type '"visible"'.
           Type 'string' is not assignable to type '"visible"'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(59,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
-tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(60,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P] | undefined; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(61,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(62,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
+tests/cases/conformance/types/mapped/mappedTypeErrors.ts(67,9): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]: T[P][]; }'.
 
 
-==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (13 errors) ====
+==== tests/cases/conformance/types/mapped/mappedTypeErrors.ts (14 errors) ====
     
     interface Shape {
         name: string;
@@ -46,14 +45,15 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Su
     type T00 = { [P in P]: string };  // Error
                        ~
 !!! error TS2313: Type parameter 'P' has a circular constraint.
-    type T01 = { [P in Date]: number };  // Error
+    type T01 = { [P in number]: string };  // Error
+                       ~~~~~~
+!!! error TS2322: Type 'number' is not assignable to type 'string'.
+    type T02 = { [P in Date]: number };  // Error
                        ~~~~
-!!! error TS2322: Type 'Date' is not assignable to type 'string | number'.
-!!! error TS2322:   Type 'Date' is not assignable to type 'number'.
-    type T02 = Record<Date, number>;  // Error
+!!! error TS2322: Type 'Date' is not assignable to type 'string'.
+    type T03 = Record<Date, number>;  // Error
                       ~~~~
-!!! error TS2344: Type 'Date' does not satisfy the constraint 'string | number'.
-!!! error TS2344:   Type 'Date' is not assignable to type 'number'.
+!!! error TS2344: Type 'Date' does not satisfy the constraint 'string'.
     
     type T10 = Pick<Shape, "name">;
     type T11 = Pick<Shape, "foo">;  // Error
@@ -112,13 +112,13 @@ tests/cases/conformance/types/mapped/mappedTypeErrors.ts(66,9): error TS2403: Su
         var x: { [P in keyof T]: T[P] };
         var x: { [P in keyof T]?: T[P] };  // Error
             ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P]; }'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ [P in keyof T]?: T[P] | undefined; }'.
         var x: { readonly [P in keyof T]: T[P] };  // Error
             ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]: T[P]; }'.
         var x: { readonly [P in keyof T]?: T[P] };  // Error
             ~
-!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P]; }'.
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type '{ [P in keyof T]: T[P]; }', but here has type '{ readonly [P in keyof T]?: T[P] | undefined; }'.
     }
     
     function f12<T>() {
diff --git a/tests/baselines/reference/mappedTypeErrors.js b/tests/baselines/reference/mappedTypeErrors.js
index fe03b5c9593..cb840da32f7 100644
--- a/tests/baselines/reference/mappedTypeErrors.js
+++ b/tests/baselines/reference/mappedTypeErrors.js
@@ -19,8 +19,9 @@ interface Point {
 // Constraint checking
 
 type T00 = { [P in P]: string };  // Error
-type T01 = { [P in Date]: number };  // Error
-type T02 = Record<Date, number>;  // Error
+type T01 = { [P in number]: string };  // Error
+type T02 = { [P in Date]: number };  // Error
+type T03 = Record<Date, number>;  // Error
 
 type T10 = Pick<Shape, "name">;
 type T11 = Pick<Shape, "foo">;  // Error
@@ -116,9 +117,12 @@ declare type T00 = {
     [P in P]: string;
 };
 declare type T01 = {
+    [P in number]: string;
+};
+declare type T02 = {
     [P in Date]: number;
 };
-declare type T02 = Record<Date, number>;
+declare type T03 = Record<Date, number>;
 declare type T10 = Pick<Shape, "name">;
 declare type T11 = Pick<Shape, "foo">;
 declare type T12 = Pick<Shape, "name" | "foo">;
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.js b/tests/baselines/reference/mappedTypeInferenceCircularity.js
new file mode 100644
index 00000000000..d5918d342f6
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.js
@@ -0,0 +1,12 @@
+//// [mappedTypeInferenceCircularity.ts]
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+type Block<P> = <T>(func: HTML) => {};
+
+declare var h: HTML;
+h.div(h);
+
+//// [mappedTypeInferenceCircularity.js]
+// Repro from #12511
+h.div(h);
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.symbols b/tests/baselines/reference/mappedTypeInferenceCircularity.symbols
new file mode 100644
index 00000000000..33dceb5cd76
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/mappedTypeInferenceCircularity.ts ===
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+>K : Symbol(K, Decl(mappedTypeInferenceCircularity.ts, 2, 15))
+>Block : Symbol(Block, Decl(mappedTypeInferenceCircularity.ts, 2, 42))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+type Block<P> = <T>(func: HTML) => {};
+>Block : Symbol(Block, Decl(mappedTypeInferenceCircularity.ts, 2, 42))
+>P : Symbol(P, Decl(mappedTypeInferenceCircularity.ts, 3, 11))
+>T : Symbol(T, Decl(mappedTypeInferenceCircularity.ts, 3, 17))
+>func : Symbol(func, Decl(mappedTypeInferenceCircularity.ts, 3, 20))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+declare var h: HTML;
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+>HTML : Symbol(HTML, Decl(mappedTypeInferenceCircularity.ts, 0, 0))
+
+h.div(h);
+>h.div : Symbol(div)
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+>div : Symbol(div)
+>h : Symbol(h, Decl(mappedTypeInferenceCircularity.ts, 5, 11))
+
diff --git a/tests/baselines/reference/mappedTypeInferenceCircularity.types b/tests/baselines/reference/mappedTypeInferenceCircularity.types
new file mode 100644
index 00000000000..451da474756
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeInferenceCircularity.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/mappedTypeInferenceCircularity.ts ===
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+>HTML : HTML
+>K : K
+>Block : Block<P>
+>HTML : HTML
+
+type Block<P> = <T>(func: HTML) => {};
+>Block : Block<P>
+>P : P
+>T : T
+>func : HTML
+>HTML : HTML
+
+declare var h: HTML;
+>h : HTML
+>HTML : HTML
+
+h.div(h);
+>h.div(h) : {}
+>h.div : Block<HTML>
+>h : HTML
+>div : Block<HTML>
+>h : HTML
+
diff --git a/tests/baselines/reference/mappedTypeModifiers.js b/tests/baselines/reference/mappedTypeModifiers.js
new file mode 100644
index 00000000000..8489194f95a
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.js
@@ -0,0 +1,145 @@
+//// [mappedTypeModifiers.ts]
+
+type T = { a: number, b: string };
+type TU = { a: number | undefined, b: string | undefined };
+type TP = { a?: number, b?: string };
+type TR = { readonly a: number, readonly b: string };
+type TPR = { readonly a?: number, readonly b?: string };
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+var v00: keyof T;
+var v00: keyof TU;
+var v00: keyof TP;
+var v00: keyof TR;
+var v00: keyof TPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+var v01: Pick<TR, keyof T>;
+var v01: Pick<Readonly<T>, keyof T>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: TU;
+var v02: Pick<TP, keyof T>;
+var v02: Pick<TPR, keyof T>;
+var v02: Pick<Partial<T>, keyof T>;
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: TP;
+var v03: Partial<T>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: TR;
+var v04: Readonly<T>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: TPR;
+var v05: Partial<TR>;
+var v05: Readonly<TP>;
+var v05: Partial<Readonly<T>>;
+var v05: Readonly<Partial<T>>;
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+
+type B = { a: { x: number }, b: { x: string } };
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+type BP = { a?: { x: number }, b?: { x: string } };
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+var b00: keyof B;
+var b00: keyof BU;
+var b00: keyof BP;
+var b00: keyof BR;
+var b00: keyof BPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+var b01: Pick<BR, keyof B>;
+var b01: Pick<Readonly<BR>, keyof B>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+var b02: Pick<BP, keyof B>;
+var b02: Pick<BPR, keyof B>;
+var b02: Pick<Partial<B>, keyof B>;
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+var b03: Partial<B>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+var b04: Readonly<B>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+var b05: Partial<BR>;
+var b05: Readonly<BP>;
+var b05: Partial<Readonly<B>>;
+var b05: Readonly<Partial<B>>;
+
+//// [mappedTypeModifiers.js]
+// Validate they all have the same keys
+var v00;
+var v00;
+var v00;
+var v00;
+var v00;
+var v00;
+// Validate that non-isomorphic mapped types strip modifiers
+var v01;
+var v01;
+var v01;
+// Validate that non-isomorphic mapped types strip modifiers
+var v02;
+var v02;
+var v02;
+var v02;
+var v02;
+// Validate that isomorphic mapped types preserve optional modifier
+var v03;
+var v03;
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04;
+var v04;
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05;
+var v05;
+var v05;
+var v05;
+var v05;
+// Validate they all have the same keys
+var b00;
+var b00;
+var b00;
+var b00;
+var b00;
+var b00;
+// Validate that non-isomorphic mapped types strip modifiers
+var b01;
+var b01;
+var b01;
+// Validate that non-isomorphic mapped types strip modifiers
+var b02;
+var b02;
+var b02;
+var b02;
+var b02;
+// Validate that isomorphic mapped types preserve optional modifier
+var b03;
+var b03;
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04;
+var b04;
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05;
+var b05;
+var b05;
+var b05;
+var b05;
diff --git a/tests/baselines/reference/mappedTypeModifiers.symbols b/tests/baselines/reference/mappedTypeModifiers.symbols
new file mode 100644
index 00000000000..8be2f53cec1
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.symbols
@@ -0,0 +1,313 @@
+=== tests/cases/conformance/types/mapped/mappedTypeModifiers.ts ===
+
+type T = { a: number, b: string };
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 1, 10))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 1, 21))
+
+type TU = { a: number | undefined, b: string | undefined };
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 2, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 2, 34))
+
+type TP = { a?: number, b?: string };
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 3, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 3, 23))
+
+type TR = { readonly a: number, readonly b: string };
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 4, 11))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 4, 31))
+
+type TPR = { readonly a?: number, readonly b?: string };
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 5, 12))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 5, 33))
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+
+var v00: keyof T;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v00: keyof TU;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
+
+var v00: keyof TP;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+
+var v00: keyof TR;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+
+var v00: keyof TPR;
+>v00 : Symbol(v00, Decl(mappedTypeModifiers.ts, 8, 3), Decl(mappedTypeModifiers.ts, 9, 3), Decl(mappedTypeModifiers.ts, 10, 3), Decl(mappedTypeModifiers.ts, 11, 3), Decl(mappedTypeModifiers.ts, 12, 3), Decl(mappedTypeModifiers.ts, 13, 3))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v01: Pick<TR, keyof T>;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v01: Pick<Readonly<T>, keyof T>;
+>v01 : Symbol(v01, Decl(mappedTypeModifiers.ts, 16, 3), Decl(mappedTypeModifiers.ts, 17, 3), Decl(mappedTypeModifiers.ts, 18, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: TU;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>TU : Symbol(TU, Decl(mappedTypeModifiers.ts, 1, 34))
+
+var v02: Pick<TP, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<TPR, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<Partial<T>, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+>v02 : Symbol(v02, Decl(mappedTypeModifiers.ts, 21, 3), Decl(mappedTypeModifiers.ts, 22, 3), Decl(mappedTypeModifiers.ts, 23, 3), Decl(mappedTypeModifiers.ts, 24, 3), Decl(mappedTypeModifiers.ts, 25, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: TP;
+>v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+
+var v03: Partial<T>;
+>v03 : Symbol(v03, Decl(mappedTypeModifiers.ts, 28, 3), Decl(mappedTypeModifiers.ts, 29, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: TR;
+>v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+
+var v04: Readonly<T>;
+>v04 : Symbol(v04, Decl(mappedTypeModifiers.ts, 32, 3), Decl(mappedTypeModifiers.ts, 33, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: TPR;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>TPR : Symbol(TPR, Decl(mappedTypeModifiers.ts, 4, 53))
+
+var v05: Partial<TR>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>TR : Symbol(TR, Decl(mappedTypeModifiers.ts, 3, 37))
+
+var v05: Readonly<TP>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>TP : Symbol(TP, Decl(mappedTypeModifiers.ts, 2, 59))
+
+var v05: Partial<Readonly<T>>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+var v05: Readonly<Partial<T>>;
+>v05 : Symbol(v05, Decl(mappedTypeModifiers.ts, 36, 3), Decl(mappedTypeModifiers.ts, 37, 3), Decl(mappedTypeModifiers.ts, 38, 3), Decl(mappedTypeModifiers.ts, 39, 3), Decl(mappedTypeModifiers.ts, 40, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 0, 0))
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+>Boxified : Symbol(Boxified, Decl(mappedTypeModifiers.ts, 40, 30))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 42, 22))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 42, 38))
+>T : Symbol(T, Decl(mappedTypeModifiers.ts, 42, 14))
+>P : Symbol(P, Decl(mappedTypeModifiers.ts, 42, 22))
+
+type B = { a: { x: number }, b: { x: string } };
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 44, 10))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 44, 15))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 44, 28))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 44, 33))
+
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 45, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 45, 16))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 45, 41))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 45, 46))
+
+type BP = { a?: { x: number }, b?: { x: string } };
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 46, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 46, 17))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 46, 30))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 46, 36))
+
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 47, 11))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 47, 25))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 47, 38))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 47, 52))
+
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+>a : Symbol(a, Decl(mappedTypeModifiers.ts, 48, 12))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 48, 27))
+>b : Symbol(b, Decl(mappedTypeModifiers.ts, 48, 40))
+>x : Symbol(x, Decl(mappedTypeModifiers.ts, 48, 55))
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+
+var b00: keyof B;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b00: keyof BU;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+
+var b00: keyof BP;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b00: keyof BR;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b00: keyof BPR;
+>b00 : Symbol(b00, Decl(mappedTypeModifiers.ts, 51, 3), Decl(mappedTypeModifiers.ts, 52, 3), Decl(mappedTypeModifiers.ts, 53, 3), Decl(mappedTypeModifiers.ts, 54, 3), Decl(mappedTypeModifiers.ts, 55, 3), Decl(mappedTypeModifiers.ts, 56, 3))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b01: Pick<BR, keyof B>;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b01: Pick<Readonly<BR>, keyof B>;
+>b01 : Symbol(b01, Decl(mappedTypeModifiers.ts, 59, 3), Decl(mappedTypeModifiers.ts, 60, 3), Decl(mappedTypeModifiers.ts, 61, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>BU : Symbol(BU, Decl(mappedTypeModifiers.ts, 44, 48))
+
+var b02: Pick<BP, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<BPR, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<Partial<B>, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+>b02 : Symbol(b02, Decl(mappedTypeModifiers.ts, 64, 3), Decl(mappedTypeModifiers.ts, 65, 3), Decl(mappedTypeModifiers.ts, 66, 3), Decl(mappedTypeModifiers.ts, 67, 3), Decl(mappedTypeModifiers.ts, 68, 3))
+>Pick : Symbol(Pick, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+>b03 : Symbol(b03, Decl(mappedTypeModifiers.ts, 71, 3), Decl(mappedTypeModifiers.ts, 72, 3))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b03: Partial<B>;
+>b03 : Symbol(b03, Decl(mappedTypeModifiers.ts, 71, 3), Decl(mappedTypeModifiers.ts, 72, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+>b04 : Symbol(b04, Decl(mappedTypeModifiers.ts, 75, 3), Decl(mappedTypeModifiers.ts, 76, 3))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b04: Readonly<B>;
+>b04 : Symbol(b04, Decl(mappedTypeModifiers.ts, 75, 3), Decl(mappedTypeModifiers.ts, 76, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>BPR : Symbol(BPR, Decl(mappedTypeModifiers.ts, 47, 67))
+
+var b05: Partial<BR>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>BR : Symbol(BR, Decl(mappedTypeModifiers.ts, 46, 51))
+
+var b05: Readonly<BP>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>BP : Symbol(BP, Decl(mappedTypeModifiers.ts, 45, 73))
+
+var b05: Partial<Readonly<B>>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
+var b05: Readonly<Partial<B>>;
+>b05 : Symbol(b05, Decl(mappedTypeModifiers.ts, 79, 3), Decl(mappedTypeModifiers.ts, 80, 3), Decl(mappedTypeModifiers.ts, 81, 3), Decl(mappedTypeModifiers.ts, 82, 3), Decl(mappedTypeModifiers.ts, 83, 3))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>B : Symbol(B, Decl(mappedTypeModifiers.ts, 42, 51))
+
diff --git a/tests/baselines/reference/mappedTypeModifiers.types b/tests/baselines/reference/mappedTypeModifiers.types
new file mode 100644
index 00000000000..61b9bfc03b2
--- /dev/null
+++ b/tests/baselines/reference/mappedTypeModifiers.types
@@ -0,0 +1,313 @@
+=== tests/cases/conformance/types/mapped/mappedTypeModifiers.ts ===
+
+type T = { a: number, b: string };
+>T : T
+>a : number
+>b : string
+
+type TU = { a: number | undefined, b: string | undefined };
+>TU : TU
+>a : number | undefined
+>b : string | undefined
+
+type TP = { a?: number, b?: string };
+>TP : TP
+>a : number | undefined
+>b : string | undefined
+
+type TR = { readonly a: number, readonly b: string };
+>TR : TR
+>a : number
+>b : string
+
+type TPR = { readonly a?: number, readonly b?: string };
+>TPR : TPR
+>a : number | undefined
+>b : string | undefined
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+>v00 : "a" | "b"
+
+var v00: keyof T;
+>v00 : "a" | "b"
+>T : T
+
+var v00: keyof TU;
+>v00 : "a" | "b"
+>TU : TU
+
+var v00: keyof TP;
+>v00 : "a" | "b"
+>TP : TP
+
+var v00: keyof TR;
+>v00 : "a" | "b"
+>TR : TR
+
+var v00: keyof TPR;
+>v00 : "a" | "b"
+>TPR : TPR
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+>v01 : T
+>T : T
+
+var v01: Pick<TR, keyof T>;
+>v01 : T
+>Pick : Pick<T, K>
+>TR : TR
+>T : T
+
+var v01: Pick<Readonly<T>, keyof T>;
+>v01 : T
+>Pick : Pick<T, K>
+>Readonly : Readonly<T>
+>T : T
+>T : T
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: TU;
+>v02 : TU
+>TU : TU
+
+var v02: Pick<TP, keyof T>;
+>v02 : TU
+>Pick : Pick<T, K>
+>TP : TP
+>T : T
+
+var v02: Pick<TPR, keyof T>;
+>v02 : TU
+>Pick : Pick<T, K>
+>TPR : TPR
+>T : T
+
+var v02: Pick<Partial<T>, keyof T>;
+>v02 : TU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>T : T
+>T : T
+
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+>v02 : TU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>T : T
+>T : T
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: TP;
+>v03 : TP
+>TP : TP
+
+var v03: Partial<T>;
+>v03 : TP
+>Partial : Partial<T>
+>T : T
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: TR;
+>v04 : TR
+>TR : TR
+
+var v04: Readonly<T>;
+>v04 : TR
+>Readonly : Readonly<T>
+>T : T
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: TPR;
+>v05 : TPR
+>TPR : TPR
+
+var v05: Partial<TR>;
+>v05 : TPR
+>Partial : Partial<T>
+>TR : TR
+
+var v05: Readonly<TP>;
+>v05 : TPR
+>Readonly : Readonly<T>
+>TP : TP
+
+var v05: Partial<Readonly<T>>;
+>v05 : TPR
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>T : T
+
+var v05: Readonly<Partial<T>>;
+>v05 : TPR
+>Readonly : Readonly<T>
+>Partial : Partial<T>
+>T : T
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+>Boxified : Boxified<T>
+>T : T
+>P : P
+>T : T
+>x : T[P]
+>T : T
+>P : P
+
+type B = { a: { x: number }, b: { x: string } };
+>B : B
+>a : { x: number; }
+>x : number
+>b : { x: string; }
+>x : string
+
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+>BU : BU
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+type BP = { a?: { x: number }, b?: { x: string } };
+>BP : BP
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+>BR : BR
+>a : { x: number; }
+>x : number
+>b : { x: string; }
+>x : string
+
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+>BPR : BPR
+>a : { x: number; } | undefined
+>x : number
+>b : { x: string; } | undefined
+>x : string
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+>b00 : "a" | "b"
+
+var b00: keyof B;
+>b00 : "a" | "b"
+>B : B
+
+var b00: keyof BU;
+>b00 : "a" | "b"
+>BU : BU
+
+var b00: keyof BP;
+>b00 : "a" | "b"
+>BP : BP
+
+var b00: keyof BR;
+>b00 : "a" | "b"
+>BR : BR
+
+var b00: keyof BPR;
+>b00 : "a" | "b"
+>BPR : BPR
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+>b01 : B
+>B : B
+
+var b01: Pick<BR, keyof B>;
+>b01 : B
+>Pick : Pick<T, K>
+>BR : BR
+>B : B
+
+var b01: Pick<Readonly<BR>, keyof B>;
+>b01 : B
+>Pick : Pick<T, K>
+>Readonly : Readonly<T>
+>BR : BR
+>B : B
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+>b02 : BU
+>BU : BU
+
+var b02: Pick<BP, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>BP : BP
+>B : B
+
+var b02: Pick<BPR, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>BPR : BPR
+>B : B
+
+var b02: Pick<Partial<B>, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>B : B
+>B : B
+
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+>b02 : BU
+>Pick : Pick<T, K>
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>B : B
+>B : B
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+>b03 : BP
+>BP : BP
+
+var b03: Partial<B>;
+>b03 : BP
+>Partial : Partial<T>
+>B : B
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+>b04 : BR
+>BR : BR
+
+var b04: Readonly<B>;
+>b04 : BR
+>Readonly : Readonly<T>
+>B : B
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+>b05 : BPR
+>BPR : BPR
+
+var b05: Partial<BR>;
+>b05 : BPR
+>Partial : Partial<T>
+>BR : BR
+
+var b05: Readonly<BP>;
+>b05 : BPR
+>Readonly : Readonly<T>
+>BP : BP
+
+var b05: Partial<Readonly<B>>;
+>b05 : BPR
+>Partial : Partial<T>
+>Readonly : Readonly<T>
+>B : B
+
+var b05: Readonly<Partial<B>>;
+>b05 : BPR
+>Readonly : Readonly<T>
+>Partial : Partial<T>
+>B : B
+
diff --git a/tests/baselines/reference/mappedTypes1.js b/tests/baselines/reference/mappedTypes1.js
index 71a8d5abb67..1998ad5ab6b 100644
--- a/tests/baselines/reference/mappedTypes1.js
+++ b/tests/baselines/reference/mappedTypes1.js
@@ -26,26 +26,25 @@ type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
 type T40 = { [P in string]: void };
-type T41 = { [P in number]: void };
-type T42 = { [P in string | number]: void };
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 type T44 = { [P in "a" | "b" | "0" | "1"]: void };
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 
 let x1 = f1();
 let x2 = f2();
-let x3 = f3();
+let x3 = f3();
+let x4 = f4();
 
 //// [mappedTypes1.js]
 var x1 = f1();
 var x2 = f2();
 var x3 = f3();
+var x4 = f4();
 
 
 //// [mappedTypes1.d.ts]
@@ -114,26 +113,14 @@ declare type T38 = {
 declare type T40 = {
     [P in string]: void;
 };
-declare type T41 = {
-    [P in number]: void;
-};
-declare type T42 = {
-    [P in string | number]: void;
-};
 declare type T43 = {
-    [P in "a" | "b" | 0 | 1]: void;
+    [P in "a" | "b"]: void;
 };
 declare type T44 = {
     [P in "a" | "b" | "0" | "1"]: void;
 };
-declare type T45 = {
-    [P in "a" | "b" | "0" | "1" | 0 | 1]: void;
-};
-declare type T46 = {
-    [P in number | "a" | "b" | 0 | 1]: void;
-};
 declare type T47 = {
-    [P in string | number | "a" | "b" | 0 | 1]: void;
+    [P in string | "a" | "b" | "0" | "1"]: void;
 };
 declare function f1<T1>(): {
     [P in keyof T1]: void;
@@ -144,32 +131,13 @@ declare function f2<T1 extends string>(): {
 declare function f3<T1 extends number>(): {
     [P in keyof T1]: void;
 };
-declare let x1: {};
-declare let x2: {
-    [x: number]: void;
-    toString: void;
-    charAt: void;
-    charCodeAt: void;
-    concat: void;
-    indexOf: void;
-    lastIndexOf: void;
-    localeCompare: void;
-    match: void;
-    replace: void;
-    search: void;
-    slice: void;
-    split: void;
-    substring: void;
-    toLowerCase: void;
-    toLocaleLowerCase: void;
-    toUpperCase: void;
-    toLocaleUpperCase: void;
-    trim: void;
-    length: void;
-    substr: void;
-    valueOf: void;
+declare function f4<T1 extends Number>(): {
+    [P in keyof T1]: void;
 };
-declare let x3: {
+declare let x1: {};
+declare let x2: string;
+declare let x3: number;
+declare let x4: {
     toString: void;
     valueOf: void;
     toFixed: void;
diff --git a/tests/baselines/reference/mappedTypes1.symbols b/tests/baselines/reference/mappedTypes1.symbols
index 908fbb3b0e1..e8c09b25989 100644
--- a/tests/baselines/reference/mappedTypes1.symbols
+++ b/tests/baselines/reference/mappedTypes1.symbols
@@ -110,61 +110,56 @@ type T40 = { [P in string]: void };
 >T40 : Symbol(T40, Decl(mappedTypes1.ts, 24, 40))
 >P : Symbol(P, Decl(mappedTypes1.ts, 26, 14))
 
-type T41 = { [P in number]: void };
->T41 : Symbol(T41, Decl(mappedTypes1.ts, 26, 35))
+type T43 = { [P in "a" | "b"]: void };
+>T43 : Symbol(T43, Decl(mappedTypes1.ts, 26, 35))
 >P : Symbol(P, Decl(mappedTypes1.ts, 27, 14))
 
-type T42 = { [P in string | number]: void };
->T42 : Symbol(T42, Decl(mappedTypes1.ts, 27, 35))
+type T44 = { [P in "a" | "b" | "0" | "1"]: void };
+>T44 : Symbol(T44, Decl(mappedTypes1.ts, 27, 38))
 >P : Symbol(P, Decl(mappedTypes1.ts, 28, 14))
 
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
->T43 : Symbol(T43, Decl(mappedTypes1.ts, 28, 44))
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
+>T47 : Symbol(T47, Decl(mappedTypes1.ts, 28, 50))
 >P : Symbol(P, Decl(mappedTypes1.ts, 29, 14))
 
-type T44 = { [P in "a" | "b" | "0" | "1"]: void };
->T44 : Symbol(T44, Decl(mappedTypes1.ts, 29, 46))
->P : Symbol(P, Decl(mappedTypes1.ts, 30, 14))
-
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
->T45 : Symbol(T45, Decl(mappedTypes1.ts, 30, 50))
->P : Symbol(P, Decl(mappedTypes1.ts, 31, 14))
-
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
->T46 : Symbol(T46, Decl(mappedTypes1.ts, 31, 58))
->P : Symbol(P, Decl(mappedTypes1.ts, 32, 14))
-
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
->T47 : Symbol(T47, Decl(mappedTypes1.ts, 32, 55))
->P : Symbol(P, Decl(mappedTypes1.ts, 33, 14))
-
 declare function f1<T1>(): { [P in keyof T1]: void };
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 35, 30))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 35, 20))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 29, 59))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 31, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 31, 30))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 31, 20))
 
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 36, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 36, 20))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 31, 53))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 32, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 32, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 32, 20))
 
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
->P : Symbol(P, Decl(mappedTypes1.ts, 37, 45))
->T1 : Symbol(T1, Decl(mappedTypes1.ts, 37, 20))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 32, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 33, 20))
+>P : Symbol(P, Decl(mappedTypes1.ts, 33, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 33, 20))
+
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
+>f4 : Symbol(f4, Decl(mappedTypes1.ts, 33, 68))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 34, 20))
+>Number : Symbol(Number, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
+>P : Symbol(P, Decl(mappedTypes1.ts, 34, 45))
+>T1 : Symbol(T1, Decl(mappedTypes1.ts, 34, 20))
 
 let x1 = f1();
->x1 : Symbol(x1, Decl(mappedTypes1.ts, 39, 3))
->f1 : Symbol(f1, Decl(mappedTypes1.ts, 33, 64))
+>x1 : Symbol(x1, Decl(mappedTypes1.ts, 36, 3))
+>f1 : Symbol(f1, Decl(mappedTypes1.ts, 29, 59))
 
 let x2 = f2();
->x2 : Symbol(x2, Decl(mappedTypes1.ts, 40, 3))
->f2 : Symbol(f2, Decl(mappedTypes1.ts, 35, 53))
+>x2 : Symbol(x2, Decl(mappedTypes1.ts, 37, 3))
+>f2 : Symbol(f2, Decl(mappedTypes1.ts, 31, 53))
 
 let x3 = f3();
->x3 : Symbol(x3, Decl(mappedTypes1.ts, 41, 3))
->f3 : Symbol(f3, Decl(mappedTypes1.ts, 36, 68))
+>x3 : Symbol(x3, Decl(mappedTypes1.ts, 38, 3))
+>f3 : Symbol(f3, Decl(mappedTypes1.ts, 32, 68))
+
+let x4 = f4();
+>x4 : Symbol(x4, Decl(mappedTypes1.ts, 39, 3))
+>f4 : Symbol(f4, Decl(mappedTypes1.ts, 33, 68))
 
diff --git a/tests/baselines/reference/mappedTypes1.types b/tests/baselines/reference/mappedTypes1.types
index 06aeaa89621..35d13143bab 100644
--- a/tests/baselines/reference/mappedTypes1.types
+++ b/tests/baselines/reference/mappedTypes1.types
@@ -112,15 +112,7 @@ type T40 = { [P in string]: void };
 >T40 : T40
 >P : P
 
-type T41 = { [P in number]: void };
->T41 : T41
->P : P
-
-type T42 = { [P in string | number]: void };
->T42 : T42
->P : P
-
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 >T43 : T43
 >P : P
 
@@ -128,15 +120,7 @@ type T44 = { [P in "a" | "b" | "0" | "1"]: void };
 >T44 : T44
 >P : P
 
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
->T45 : T45
->P : P
-
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
->T46 : T46
->P : P
-
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 >T47 : T47
 >P : P
 
@@ -158,18 +142,30 @@ declare function f3<T1 extends number>(): { [P in keyof T1]: void };
 >P : P
 >T1 : T1
 
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
+>f4 : <T1 extends Number>() => { [P in keyof T1]: void; }
+>T1 : T1
+>Number : Number
+>P : P
+>T1 : T1
+
 let x1 = f1();
 >x1 : {}
 >f1() : {}
 >f1 : <T1>() => { [P in keyof T1]: void; }
 
 let x2 = f2();
->x2 : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
->f2() : { [x: number]: void; toString: void; charAt: void; charCodeAt: void; concat: void; indexOf: void; lastIndexOf: void; localeCompare: void; match: void; replace: void; search: void; slice: void; split: void; substring: void; toLowerCase: void; toLocaleLowerCase: void; toUpperCase: void; toLocaleUpperCase: void; trim: void; length: void; substr: void; valueOf: void; }
+>x2 : string
+>f2() : string
 >f2 : <T1 extends string>() => { [P in keyof T1]: void; }
 
 let x3 = f3();
->x3 : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
->f3() : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>x3 : number
+>f3() : number
 >f3 : <T1 extends number>() => { [P in keyof T1]: void; }
 
+let x4 = f4();
+>x4 : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f4() : { toString: void; valueOf: void; toFixed: void; toExponential: void; toPrecision: void; toLocaleString: void; }
+>f4 : <T1 extends Number>() => { [P in keyof T1]: void; }
+
diff --git a/tests/baselines/reference/mappedTypes2.js b/tests/baselines/reference/mappedTypes2.js
index 25bb3fb6ded..84d052b6287 100644
--- a/tests/baselines/reference/mappedTypes2.js
+++ b/tests/baselines/reference/mappedTypes2.js
@@ -27,28 +27,33 @@ type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
+interface Point {
+    x: number;
+    y: number;
+}
+
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -69,7 +74,7 @@ function f2(shape: Shape) {
 }
 
 function f3(shape: Shape) {
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
 }
 
 function f4() {
@@ -80,13 +85,13 @@ function f4() {
 function f5(shape: Shape) {
     const p = proxify(shape);
     let name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 
 function f6(shape: DeepReadonly<Shape>) {
-    let name = shape.name;  // DeepReadonly<string>
-    let length = name.length;  // DeepReadonly<number>
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+    let name = shape.name;  // string
+    let location = shape.location;  // DeepReadonly<Point>
+    let x = location.x;  // number
 }
 
 //// [mappedTypes2.js]
@@ -115,7 +120,7 @@ function f2(shape) {
     var partial = {};
 }
 function f3(shape) {
-    var x = pick(shape, "name", "visible"); // { name: string, visible: boolean }
+    var x = pick(shape, "name", "location"); // { name: string, location: Point }
 }
 function f4() {
     var rec = { foo: "hello", bar: "world", baz: "bye" };
@@ -124,12 +129,12 @@ function f4() {
 function f5(shape) {
     var p = proxify(shape);
     var name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 function f6(shape) {
-    var name = shape.name; // DeepReadonly<string>
-    var length = name.length; // DeepReadonly<number>
-    var toString = length.toString; // DeepReadonly<(radix?: number) => string>
+    var name = shape.name; // string
+    var location = shape.location; // DeepReadonly<Point>
+    var x = location.x; // number
 }
 
 
@@ -148,25 +153,29 @@ declare type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
+interface Point {
+    x: number;
+    y: number;
+}
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 declare function f0(s1: Shape, s2: Shape): void;
 declare function f1(shape: Shape): void;
diff --git a/tests/baselines/reference/mappedTypes2.symbols b/tests/baselines/reference/mappedTypes2.symbols
index a610658869e..079a56243c5 100644
--- a/tests/baselines/reference/mappedTypes2.symbols
+++ b/tests/baselines/reference/mappedTypes2.symbols
@@ -126,215 +126,228 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 >T : Symbol(T, Decl(mappedTypes2.ts, 27, 22))
 >K : Symbol(K, Decl(mappedTypes2.ts, 27, 24))
 
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 >mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
->obj : Symbol(obj, Decl(mappedTypes2.ts, 28, 60))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
+>obj : Symbol(obj, Decl(mappedTypes2.ts, 28, 51))
 >Record : Symbol(Record, Decl(lib.d.ts, --, --))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->f : Symbol(f, Decl(mappedTypes2.ts, 28, 78))
->x : Symbol(x, Decl(mappedTypes2.ts, 28, 83))
->T : Symbol(T, Decl(mappedTypes2.ts, 28, 53))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>f : Symbol(f, Decl(mappedTypes2.ts, 28, 69))
+>x : Symbol(x, Decl(mappedTypes2.ts, 28, 74))
+>T : Symbol(T, Decl(mappedTypes2.ts, 28, 44))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
 >Record : Symbol(Record, Decl(lib.d.ts, --, --))
 >K : Symbol(K, Decl(mappedTypes2.ts, 28, 27))
->U : Symbol(U, Decl(mappedTypes2.ts, 28, 56))
+>U : Symbol(U, Decl(mappedTypes2.ts, 28, 47))
 
 declare function proxify<T>(obj: T): Proxify<T>;
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 100))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 >obj : Symbol(obj, Decl(mappedTypes2.ts, 29, 28))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 >Proxify : Symbol(Proxify, Decl(mappedTypes2.ts, 15, 1))
 >T : Symbol(T, Decl(mappedTypes2.ts, 29, 25))
 
+interface Point {
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
+
+    x: number;
+>x : Symbol(Point.x, Decl(mappedTypes2.ts, 31, 17))
+
+    y: number;
+>y : Symbol(Point.y, Decl(mappedTypes2.ts, 32, 14))
+}
+
 interface Shape {
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     name: string;
->name : Symbol(Shape.name, Decl(mappedTypes2.ts, 31, 17))
+>name : Symbol(Shape.name, Decl(mappedTypes2.ts, 36, 17))
 
     width: number;
->width : Symbol(Shape.width, Decl(mappedTypes2.ts, 32, 17))
+>width : Symbol(Shape.width, Decl(mappedTypes2.ts, 37, 17))
 
     height: number;
->height : Symbol(Shape.height, Decl(mappedTypes2.ts, 33, 18))
+>height : Symbol(Shape.height, Decl(mappedTypes2.ts, 38, 18))
 
-    visible: boolean;
->visible : Symbol(Shape.visible, Decl(mappedTypes2.ts, 34, 19))
+    location: Point;
+>location : Symbol(Shape.location, Decl(mappedTypes2.ts, 39, 19))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 interface PartialShape {
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
 
     name?: string;
->name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 38, 24))
+>name : Symbol(PartialShape.name, Decl(mappedTypes2.ts, 43, 24))
 
     width?: number;
->width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 39, 18))
+>width : Symbol(PartialShape.width, Decl(mappedTypes2.ts, 44, 18))
 
     height?: number;
->height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 40, 19))
+>height : Symbol(PartialShape.height, Decl(mappedTypes2.ts, 45, 19))
 
-    visible?: boolean;
->visible : Symbol(PartialShape.visible, Decl(mappedTypes2.ts, 41, 20))
+    location?: Point;
+>location : Symbol(PartialShape.location, Decl(mappedTypes2.ts, 46, 20))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 interface ReadonlyShape {
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
 
     readonly name: string;
->name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 45, 25))
+>name : Symbol(ReadonlyShape.name, Decl(mappedTypes2.ts, 50, 25))
 
     readonly width: number;
->width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 46, 26))
+>width : Symbol(ReadonlyShape.width, Decl(mappedTypes2.ts, 51, 26))
 
     readonly height: number;
->height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 47, 27))
+>height : Symbol(ReadonlyShape.height, Decl(mappedTypes2.ts, 52, 27))
 
-    readonly visible: boolean;
->visible : Symbol(ReadonlyShape.visible, Decl(mappedTypes2.ts, 48, 28))
+    readonly location: Point;
+>location : Symbol(ReadonlyShape.location, Decl(mappedTypes2.ts, 53, 28))
+>Point : Symbol(Point, Decl(mappedTypes2.ts, 29, 48))
 }
 
 function f0(s1: Shape, s2: Shape) {
->f0 : Symbol(f0, Decl(mappedTypes2.ts, 50, 1))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f0 : Symbol(f0, Decl(mappedTypes2.ts, 55, 1))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     assign(s1, { name: "circle" });
 >assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
->s1 : Symbol(s1, Decl(mappedTypes2.ts, 52, 12))
->name : Symbol(name, Decl(mappedTypes2.ts, 53, 16))
+>s1 : Symbol(s1, Decl(mappedTypes2.ts, 57, 12))
+>name : Symbol(name, Decl(mappedTypes2.ts, 58, 16))
 
     assign(s2, { width: 10, height: 20 });
 >assign : Symbol(assign, Decl(mappedTypes2.ts, 23, 2))
->s2 : Symbol(s2, Decl(mappedTypes2.ts, 52, 22))
->width : Symbol(width, Decl(mappedTypes2.ts, 54, 16))
->height : Symbol(height, Decl(mappedTypes2.ts, 54, 27))
+>s2 : Symbol(s2, Decl(mappedTypes2.ts, 57, 22))
+>width : Symbol(width, Decl(mappedTypes2.ts, 59, 16))
+>height : Symbol(height, Decl(mappedTypes2.ts, 59, 27))
 }
 
 function f1(shape: Shape) {
->f1 : Symbol(f1, Decl(mappedTypes2.ts, 55, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f1 : Symbol(f1, Decl(mappedTypes2.ts, 60, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var frozen: ReadonlyShape;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
->ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 43, 1))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
+>ReadonlyShape : Symbol(ReadonlyShape, Decl(mappedTypes2.ts, 48, 1))
 
     var frozen: Readonly<Shape>;
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
 >Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var frozen = freeze(shape);
->frozen : Symbol(frozen, Decl(mappedTypes2.ts, 58, 7), Decl(mappedTypes2.ts, 59, 7), Decl(mappedTypes2.ts, 60, 7))
+>frozen : Symbol(frozen, Decl(mappedTypes2.ts, 63, 7), Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7))
 >freeze : Symbol(freeze, Decl(mappedTypes2.ts, 25, 60))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 57, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 62, 12))
 }
 
 function f2(shape: Shape) {
->f2 : Symbol(f2, Decl(mappedTypes2.ts, 61, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 63, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f2 : Symbol(f2, Decl(mappedTypes2.ts, 66, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 68, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var partial: PartialShape;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
->PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 36, 1))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
+>PartialShape : Symbol(PartialShape, Decl(mappedTypes2.ts, 41, 1))
 
     var partial: Partial<Shape>;
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     var partial: Partial<Shape> = {};
->partial : Symbol(partial, Decl(mappedTypes2.ts, 64, 7), Decl(mappedTypes2.ts, 65, 7), Decl(mappedTypes2.ts, 66, 7))
+>partial : Symbol(partial, Decl(mappedTypes2.ts, 69, 7), Decl(mappedTypes2.ts, 70, 7), Decl(mappedTypes2.ts, 71, 7))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 }
 
 function f3(shape: Shape) {
->f3 : Symbol(f3, Decl(mappedTypes2.ts, 67, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f3 : Symbol(f3, Decl(mappedTypes2.ts, 72, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
->x : Symbol(x, Decl(mappedTypes2.ts, 70, 9))
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
+>x : Symbol(x, Decl(mappedTypes2.ts, 75, 9))
 >pick : Symbol(pick, Decl(mappedTypes2.ts, 26, 48))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 69, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 74, 12))
 }
 
 function f4() {
->f4 : Symbol(f4, Decl(mappedTypes2.ts, 71, 1))
+>f4 : Symbol(f4, Decl(mappedTypes2.ts, 76, 1))
 
     const rec = { foo: "hello", bar: "world", baz: "bye" };
->rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
->foo : Symbol(foo, Decl(mappedTypes2.ts, 74, 17))
->bar : Symbol(bar, Decl(mappedTypes2.ts, 74, 31))
->baz : Symbol(baz, Decl(mappedTypes2.ts, 74, 45))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>foo : Symbol(foo, Decl(mappedTypes2.ts, 79, 17))
+>bar : Symbol(bar, Decl(mappedTypes2.ts, 79, 31))
+>baz : Symbol(baz, Decl(mappedTypes2.ts, 79, 45))
 
     const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
->lengths : Symbol(lengths, Decl(mappedTypes2.ts, 75, 9))
+>lengths : Symbol(lengths, Decl(mappedTypes2.ts, 80, 9))
 >mapObject : Symbol(mapObject, Decl(mappedTypes2.ts, 27, 78))
->rec : Symbol(rec, Decl(mappedTypes2.ts, 74, 9))
->s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
+>rec : Symbol(rec, Decl(mappedTypes2.ts, 79, 9))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
 >s.length : Symbol(String.length, Decl(lib.d.ts, --, --))
->s : Symbol(s, Decl(mappedTypes2.ts, 75, 34))
+>s : Symbol(s, Decl(mappedTypes2.ts, 80, 34))
 >length : Symbol(String.length, Decl(lib.d.ts, --, --))
 }
 
 function f5(shape: Shape) {
->f5 : Symbol(f5, Decl(mappedTypes2.ts, 76, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>f5 : Symbol(f5, Decl(mappedTypes2.ts, 81, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
     const p = proxify(shape);
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
->proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 109))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 78, 12))
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>proxify : Symbol(proxify, Decl(mappedTypes2.ts, 28, 100))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 83, 12))
 
     let name = p.name.get();
->name : Symbol(name, Decl(mappedTypes2.ts, 80, 7))
+>name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
 >p.name.get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 >p.name : Symbol(name)
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
 >name : Symbol(name)
 >get : Symbol(get, Decl(mappedTypes2.ts, 12, 17))
 
-    p.visible.set(false);
->p.visible.set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
->p.visible : Symbol(visible)
->p : Symbol(p, Decl(mappedTypes2.ts, 79, 9))
->visible : Symbol(visible)
+    p.width.set(42);
+>p.width.set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
+>p.width : Symbol(width)
+>p : Symbol(p, Decl(mappedTypes2.ts, 84, 9))
+>width : Symbol(width)
 >set : Symbol(set, Decl(mappedTypes2.ts, 13, 13))
 }
 
 function f6(shape: DeepReadonly<Shape>) {
->f6 : Symbol(f6, Decl(mappedTypes2.ts, 82, 1))
->shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
+>f6 : Symbol(f6, Decl(mappedTypes2.ts, 87, 1))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
 >DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes2.ts, 19, 1))
->Shape : Symbol(Shape, Decl(mappedTypes2.ts, 29, 48))
+>Shape : Symbol(Shape, Decl(mappedTypes2.ts, 34, 1))
 
-    let name = shape.name;  // DeepReadonly<string>
->name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
+    let name = shape.name;  // string
+>name : Symbol(name, Decl(mappedTypes2.ts, 90, 7))
 >shape.name : Symbol(name)
->shape : Symbol(shape, Decl(mappedTypes2.ts, 84, 12))
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
 >name : Symbol(name)
 
-    let length = name.length;  // DeepReadonly<number>
->length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
->name.length : Symbol(length)
->name : Symbol(name, Decl(mappedTypes2.ts, 85, 7))
->length : Symbol(length)
+    let location = shape.location;  // DeepReadonly<Point>
+>location : Symbol(location, Decl(mappedTypes2.ts, 91, 7))
+>shape.location : Symbol(location)
+>shape : Symbol(shape, Decl(mappedTypes2.ts, 89, 12))
+>location : Symbol(location)
 
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
->toString : Symbol(toString, Decl(mappedTypes2.ts, 87, 7))
->length.toString : Symbol(toString)
->length : Symbol(length, Decl(mappedTypes2.ts, 86, 7))
->toString : Symbol(toString)
+    let x = location.x;  // number
+>x : Symbol(x, Decl(mappedTypes2.ts, 92, 7))
+>location.x : Symbol(x)
+>location : Symbol(location, Decl(mappedTypes2.ts, 91, 7))
+>x : Symbol(x)
 }
diff --git a/tests/baselines/reference/mappedTypes2.types b/tests/baselines/reference/mappedTypes2.types
index 8c487288a6f..f082069f569 100644
--- a/tests/baselines/reference/mappedTypes2.types
+++ b/tests/baselines/reference/mappedTypes2.types
@@ -126,8 +126,8 @@ declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
 >T : T
 >K : K
 
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
->mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+>mapObject : <K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
 >K : K
 >T : T
 >U : U
@@ -151,6 +151,16 @@ declare function proxify<T>(obj: T): Proxify<T>;
 >Proxify : Proxify<T>
 >T : T
 
+interface Point {
+>Point : Point
+
+    x: number;
+>x : number
+
+    y: number;
+>y : number
+}
+
 interface Shape {
 >Shape : Shape
 
@@ -163,8 +173,9 @@ interface Shape {
     height: number;
 >height : number
 
-    visible: boolean;
->visible : boolean
+    location: Point;
+>location : Point
+>Point : Point
 }
 
 interface PartialShape {
@@ -179,8 +190,9 @@ interface PartialShape {
     height?: number;
 >height : number | undefined
 
-    visible?: boolean;
->visible : boolean | undefined
+    location?: Point;
+>location : Point | undefined
+>Point : Point
 }
 
 interface ReadonlyShape {
@@ -195,8 +207,9 @@ interface ReadonlyShape {
     readonly height: number;
 >height : number
 
-    readonly visible: boolean;
->visible : boolean
+    readonly location: Point;
+>location : Point
+>Point : Point
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -272,13 +285,13 @@ function f3(shape: Shape) {
 >shape : Shape
 >Shape : Shape
 
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
->x : Pick<Shape, "name" | "visible">
->pick(shape, "name", "visible") : Pick<Shape, "name" | "visible">
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
+>x : Pick<Shape, "name" | "location">
+>pick(shape, "name", "location") : Pick<Shape, "name" | "location">
 >pick : <T, K extends keyof T>(obj: T, ...keys: K[]) => Pick<T, K>
 >shape : Shape
 >"name" : "name"
->"visible" : "visible"
+>"location" : "location"
 }
 
 function f4() {
@@ -297,7 +310,7 @@ function f4() {
     const lengths = mapObject(rec, s => s.length);  // { foo: number, bar: number, baz: number }
 >lengths : Record<"foo" | "bar" | "baz", number>
 >mapObject(rec, s => s.length) : Record<"foo" | "bar" | "baz", number>
->mapObject : <K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
+>mapObject : <K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U) => Record<K, U>
 >rec : { foo: string; bar: string; baz: string; }
 >s => s.length : (s: string) => number
 >s : string
@@ -326,14 +339,14 @@ function f5(shape: Shape) {
 >name : Proxy<string>
 >get : () => string
 
-    p.visible.set(false);
->p.visible.set(false) : void
->p.visible.set : (value: boolean) => void
->p.visible : Proxy<boolean>
+    p.width.set(42);
+>p.width.set(42) : void
+>p.width.set : (value: number) => void
+>p.width : Proxy<number>
 >p : Proxify<Shape>
->visible : Proxy<boolean>
->set : (value: boolean) => void
->false : false
+>width : Proxy<number>
+>set : (value: number) => void
+>42 : 42
 }
 
 function f6(shape: DeepReadonly<Shape>) {
@@ -342,21 +355,21 @@ function f6(shape: DeepReadonly<Shape>) {
 >DeepReadonly : DeepReadonly<T>
 >Shape : Shape
 
-    let name = shape.name;  // DeepReadonly<string>
->name : DeepReadonly<string>
->shape.name : DeepReadonly<string>
+    let name = shape.name;  // string
+>name : string
+>shape.name : string
 >shape : DeepReadonly<Shape>
->name : DeepReadonly<string>
+>name : string
 
-    let length = name.length;  // DeepReadonly<number>
->length : DeepReadonly<number>
->name.length : DeepReadonly<number>
->name : DeepReadonly<string>
->length : DeepReadonly<number>
+    let location = shape.location;  // DeepReadonly<Point>
+>location : DeepReadonly<Point>
+>shape.location : DeepReadonly<Point>
+>shape : DeepReadonly<Shape>
+>location : DeepReadonly<Point>
 
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
->toString : DeepReadonly<(radix?: number | undefined) => string>
->length.toString : DeepReadonly<(radix?: number | undefined) => string>
->length : DeepReadonly<number>
->toString : DeepReadonly<(radix?: number | undefined) => string>
+    let x = location.x;  // number
+>x : number
+>location.x : number
+>location : DeepReadonly<Point>
+>x : number
 }
diff --git a/tests/baselines/reference/mappedTypes4.js b/tests/baselines/reference/mappedTypes4.js
new file mode 100644
index 00000000000..bb003b1a1ec
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.js
@@ -0,0 +1,129 @@
+//// [mappedTypes4.ts]
+
+type Box<T> = {
+};
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+    if (typeof obj === "object") {
+        let result = {} as Boxified<T>;
+        for (let k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return <any>obj;
+}
+
+type A = { a: string };
+type B = { b: string };
+type C = { c: string };
+
+function f1(x: A | B | C | undefined) {
+    return boxify(x);
+}
+
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+
+type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+type Foo = {
+    x: number;
+    y: { a: string, b: number };
+    z: boolean;
+};
+
+type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: { readonly a: string, readonly b: number };
+    readonly z: boolean;
+};
+
+var x1: DeepReadonly<Foo>;
+var x1: DeepReadonlyFoo;
+
+//// [mappedTypes4.js]
+function boxify(obj) {
+    if (typeof obj === "object") {
+        var result = {};
+        for (var k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return obj;
+}
+function f1(x) {
+    return boxify(x);
+}
+var x1;
+var x1;
+
+
+//// [mappedTypes4.d.ts]
+declare type Box<T> = {};
+declare type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+declare function boxify<T>(obj: T): Boxified<T>;
+declare type A = {
+    a: string;
+};
+declare type B = {
+    b: string;
+};
+declare type C = {
+    c: string;
+};
+declare function f1(x: A | B | C | undefined): Boxified<A> | Boxified<B> | Boxified<C> | undefined;
+declare type T00 = Partial<A | B | C>;
+declare type T01 = Readonly<A | B | C | null | undefined>;
+declare type T02 = Boxified<A | B[] | C | string>;
+declare type T03 = Readonly<string | number | boolean | null | undefined | void>;
+declare type T04 = Boxified<string | number | boolean | null | undefined | void>;
+declare type T05 = Partial<"hello" | "world" | 42>;
+declare type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+};
+declare type T10 = BoxifiedWithSentinel<A | B | C, null>;
+declare type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+declare type T12 = BoxifiedWithSentinel<string, undefined>;
+declare type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+declare type Foo = {
+    x: number;
+    y: {
+        a: string;
+        b: number;
+    };
+    z: boolean;
+};
+declare type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: {
+        readonly a: string;
+        readonly b: number;
+    };
+    readonly z: boolean;
+};
+declare var x1: DeepReadonly<Foo>;
+declare var x1: DeepReadonlyFoo;
diff --git a/tests/baselines/reference/mappedTypes4.symbols b/tests/baselines/reference/mappedTypes4.symbols
new file mode 100644
index 00000000000..b57adfe9954
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.symbols
@@ -0,0 +1,198 @@
+=== tests/cases/conformance/types/mapped/mappedTypes4.ts ===
+
+type Box<T> = {
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 1, 9))
+
+};
+
+type Boxified<T> = {
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+
+    [P in keyof T]: Box<T[P]>;
+>P : Symbol(P, Decl(mappedTypes4.ts, 5, 5))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 4, 14))
+>P : Symbol(P, Decl(mappedTypes4.ts, 5, 5))
+
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : Symbol(boxify, Decl(mappedTypes4.ts, 6, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+
+    if (typeof obj === "object") {
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+
+        let result = {} as Boxified<T>;
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>T : Symbol(T, Decl(mappedTypes4.ts, 8, 16))
+
+        for (let k in obj) {
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+
+            result[k] = { value: obj[k] };
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+>value : Symbol(value, Decl(mappedTypes4.ts, 12, 25))
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+>k : Symbol(k, Decl(mappedTypes4.ts, 11, 16))
+        }
+        return result;
+>result : Symbol(result, Decl(mappedTypes4.ts, 10, 11))
+    }
+    return <any>obj;
+>obj : Symbol(obj, Decl(mappedTypes4.ts, 8, 19))
+}
+
+type A = { a: string };
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>a : Symbol(a, Decl(mappedTypes4.ts, 19, 10))
+
+type B = { b: string };
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>b : Symbol(b, Decl(mappedTypes4.ts, 20, 10))
+
+type C = { c: string };
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+>c : Symbol(c, Decl(mappedTypes4.ts, 21, 10))
+
+function f1(x: A | B | C | undefined) {
+>f1 : Symbol(f1, Decl(mappedTypes4.ts, 21, 23))
+>x : Symbol(x, Decl(mappedTypes4.ts, 23, 12))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+    return boxify(x);
+>boxify : Symbol(boxify, Decl(mappedTypes4.ts, 6, 2))
+>x : Symbol(x, Decl(mappedTypes4.ts, 23, 12))
+}
+
+type T00 = Partial<A | B | C>;
+>T00 : Symbol(T00, Decl(mappedTypes4.ts, 25, 1))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T01 = Readonly<A | B | C | null | undefined>;
+>T01 : Symbol(T01, Decl(mappedTypes4.ts, 27, 30))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T02 = Boxified<A | B[] | C | string>
+>T02 : Symbol(T02, Decl(mappedTypes4.ts, 28, 50))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+>T03 : Symbol(T03, Decl(mappedTypes4.ts, 29, 41))
+>Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
+
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+>T04 : Symbol(T04, Decl(mappedTypes4.ts, 30, 73))
+>Boxified : Symbol(Boxified, Decl(mappedTypes4.ts, 2, 2))
+
+type T05 = Partial<"hello" | "world" | 42>;
+>T05 : Symbol(T05, Decl(mappedTypes4.ts, 31, 73))
+>Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
+
+type BoxifiedWithSentinel<T, U> = {
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>U : Symbol(U, Decl(mappedTypes4.ts, 34, 28))
+
+    [P in keyof T]: Box<T[P]> | U;
+>P : Symbol(P, Decl(mappedTypes4.ts, 35, 5))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>Box : Symbol(Box, Decl(mappedTypes4.ts, 0, 0))
+>T : Symbol(T, Decl(mappedTypes4.ts, 34, 26))
+>P : Symbol(P, Decl(mappedTypes4.ts, 35, 5))
+>U : Symbol(U, Decl(mappedTypes4.ts, 34, 28))
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+>T10 : Symbol(T10, Decl(mappedTypes4.ts, 36, 1))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+>T11 : Symbol(T11, Decl(mappedTypes4.ts, 38, 49))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+>A : Symbol(A, Decl(mappedTypes4.ts, 17, 1))
+>B : Symbol(B, Decl(mappedTypes4.ts, 19, 23))
+>C : Symbol(C, Decl(mappedTypes4.ts, 20, 23))
+
+type T12 = BoxifiedWithSentinel<string, undefined>;
+>T12 : Symbol(T12, Decl(mappedTypes4.ts, 39, 54))
+>BoxifiedWithSentinel : Symbol(BoxifiedWithSentinel, Decl(mappedTypes4.ts, 32, 43))
+
+type DeepReadonly<T> = {
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : Symbol(P, Decl(mappedTypes4.ts, 43, 14))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>T : Symbol(T, Decl(mappedTypes4.ts, 42, 18))
+>P : Symbol(P, Decl(mappedTypes4.ts, 43, 14))
+
+};
+
+type Foo = {
+>Foo : Symbol(Foo, Decl(mappedTypes4.ts, 44, 2))
+
+    x: number;
+>x : Symbol(x, Decl(mappedTypes4.ts, 46, 12))
+
+    y: { a: string, b: number };
+>y : Symbol(y, Decl(mappedTypes4.ts, 47, 14))
+>a : Symbol(a, Decl(mappedTypes4.ts, 48, 8))
+>b : Symbol(b, Decl(mappedTypes4.ts, 48, 19))
+
+    z: boolean;
+>z : Symbol(z, Decl(mappedTypes4.ts, 48, 32))
+
+};
+
+type DeepReadonlyFoo = {
+>DeepReadonlyFoo : Symbol(DeepReadonlyFoo, Decl(mappedTypes4.ts, 50, 2))
+
+    readonly x: number;
+>x : Symbol(x, Decl(mappedTypes4.ts, 52, 24))
+
+    readonly y: { readonly a: string, readonly b: number };
+>y : Symbol(y, Decl(mappedTypes4.ts, 53, 23))
+>a : Symbol(a, Decl(mappedTypes4.ts, 54, 17))
+>b : Symbol(b, Decl(mappedTypes4.ts, 54, 37))
+
+    readonly z: boolean;
+>z : Symbol(z, Decl(mappedTypes4.ts, 54, 59))
+
+};
+
+var x1: DeepReadonly<Foo>;
+>x1 : Symbol(x1, Decl(mappedTypes4.ts, 58, 3), Decl(mappedTypes4.ts, 59, 3))
+>DeepReadonly : Symbol(DeepReadonly, Decl(mappedTypes4.ts, 40, 51))
+>Foo : Symbol(Foo, Decl(mappedTypes4.ts, 44, 2))
+
+var x1: DeepReadonlyFoo;
+>x1 : Symbol(x1, Decl(mappedTypes4.ts, 58, 3), Decl(mappedTypes4.ts, 59, 3))
+>DeepReadonlyFoo : Symbol(DeepReadonlyFoo, Decl(mappedTypes4.ts, 50, 2))
+
diff --git a/tests/baselines/reference/mappedTypes4.types b/tests/baselines/reference/mappedTypes4.types
new file mode 100644
index 00000000000..cc492d82120
--- /dev/null
+++ b/tests/baselines/reference/mappedTypes4.types
@@ -0,0 +1,213 @@
+=== tests/cases/conformance/types/mapped/mappedTypes4.ts ===
+
+type Box<T> = {
+>Box : Box<T>
+>T : T
+
+};
+
+type Boxified<T> = {
+>Boxified : Boxified<T>
+>T : T
+
+    [P in keyof T]: Box<T[P]>;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+>boxify : <T>(obj: T) => Boxified<T>
+>T : T
+>obj : T
+>T : T
+>Boxified : Boxified<T>
+>T : T
+
+    if (typeof obj === "object") {
+>typeof obj === "object" : boolean
+>typeof obj : string
+>obj : T
+>"object" : "object"
+
+        let result = {} as Boxified<T>;
+>result : Boxified<T>
+>{} as Boxified<T> : Boxified<T>
+>{} : {}
+>Boxified : Boxified<T>
+>T : T
+
+        for (let k in obj) {
+>k : keyof T
+>obj : T
+
+            result[k] = { value: obj[k] };
+>result[k] = { value: obj[k] } : { value: T[keyof T]; }
+>result[k] : Box<T[keyof T]>
+>result : Boxified<T>
+>k : keyof T
+>{ value: obj[k] } : { value: T[keyof T]; }
+>value : T[keyof T]
+>obj[k] : T[keyof T]
+>obj : T
+>k : keyof T
+        }
+        return result;
+>result : Boxified<T>
+    }
+    return <any>obj;
+><any>obj : any
+>obj : never
+}
+
+type A = { a: string };
+>A : A
+>a : string
+
+type B = { b: string };
+>B : B
+>b : string
+
+type C = { c: string };
+>C : C
+>c : string
+
+function f1(x: A | B | C | undefined) {
+>f1 : (x: A | B | C | undefined) => Boxified<A> | Boxified<B> | Boxified<C> | undefined
+>x : A | B | C | undefined
+>A : A
+>B : B
+>C : C
+
+    return boxify(x);
+>boxify(x) : Boxified<A> | Boxified<B> | Boxified<C> | undefined
+>boxify : <T>(obj: T) => Boxified<T>
+>x : A | B | C | undefined
+}
+
+type T00 = Partial<A | B | C>;
+>T00 : Partial<A> | Partial<B> | Partial<C>
+>Partial : Partial<T>
+>A : A
+>B : B
+>C : C
+
+type T01 = Readonly<A | B | C | null | undefined>;
+>T01 : Readonly<A> | Readonly<B> | Readonly<C> | null | undefined
+>Readonly : Readonly<T>
+>A : A
+>B : B
+>C : C
+>null : null
+
+type T02 = Boxified<A | B[] | C | string>
+>T02 : string | Boxified<A> | Boxified<C> | Boxified<B[]>
+>Boxified : Boxified<T>
+>A : A
+>B : B
+>C : C
+
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+>T03 : string | number | boolean | void | null | undefined
+>Readonly : Readonly<T>
+>null : null
+
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+>T04 : string | number | boolean | void | null | undefined
+>Boxified : Boxified<T>
+>null : null
+
+type T05 = Partial<"hello" | "world" | 42>;
+>T05 : "hello" | "world" | 42
+>Partial : Partial<T>
+
+type BoxifiedWithSentinel<T, U> = {
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>T : T
+>U : U
+
+    [P in keyof T]: Box<T[P]> | U;
+>P : P
+>T : T
+>Box : Box<T>
+>T : T
+>P : P
+>U : U
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+>T10 : BoxifiedWithSentinel<A, null> | BoxifiedWithSentinel<B, null> | BoxifiedWithSentinel<C, null>
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>A : A
+>B : B
+>C : C
+>null : null
+
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+>T11 : BoxifiedWithSentinel<A, undefined> | BoxifiedWithSentinel<B, undefined> | BoxifiedWithSentinel<C, undefined>
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+>A : A
+>B : B
+>C : C
+
+type T12 = BoxifiedWithSentinel<string, undefined>;
+>T12 : string
+>BoxifiedWithSentinel : BoxifiedWithSentinel<T, U>
+
+type DeepReadonly<T> = {
+>DeepReadonly : DeepReadonly<T>
+>T : T
+
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+>P : P
+>T : T
+>DeepReadonly : DeepReadonly<T>
+>T : T
+>P : P
+
+};
+
+type Foo = {
+>Foo : Foo
+
+    x: number;
+>x : number
+
+    y: { a: string, b: number };
+>y : { a: string; b: number; }
+>a : string
+>b : number
+
+    z: boolean;
+>z : boolean
+
+};
+
+type DeepReadonlyFoo = {
+>DeepReadonlyFoo : DeepReadonlyFoo
+
+    readonly x: number;
+>x : number
+
+    readonly y: { readonly a: string, readonly b: number };
+>y : { readonly a: string; readonly b: number; }
+>a : string
+>b : number
+
+    readonly z: boolean;
+>z : boolean
+
+};
+
+var x1: DeepReadonly<Foo>;
+>x1 : DeepReadonly<Foo>
+>DeepReadonly : DeepReadonly<T>
+>Foo : Foo
+
+var x1: DeepReadonlyFoo;
+>x1 : DeepReadonly<Foo>
+>DeepReadonlyFoo : DeepReadonlyFoo
+
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols b/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
index a487763582b..478997ca630 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.symbols
@@ -2,9 +2,9 @@
 
 for (const element of document.getElementsByTagName("a")) {
 >element : Symbol(element, Decl(modularizeLibrary_Dom.iterable.ts, 1, 10))
->document.getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>document.getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 >document : Symbol(document, Decl(lib.dom.d.ts, --, --))
->getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
+>getElementsByTagName : Symbol(Document.getElementsByTagName, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --))
 
     element.href;
 >element.href : Symbol(HTMLAnchorElement.href, Decl(lib.dom.d.ts, --, --))
diff --git a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
index dbce5e17ae2..054923fb5ee 100644
--- a/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
+++ b/tests/baselines/reference/modularizeLibrary_Dom.iterable.types
@@ -3,9 +3,9 @@
 for (const element of document.getElementsByTagName("a")) {
 >element : HTMLAnchorElement
 >document.getElementsByTagName("a") : NodeListOf<HTMLAnchorElement>
->document.getElementsByTagName : { (tagname: "a"): NodeListOf<HTMLAnchorElement>; (tagname: "abbr"): NodeListOf<HTMLElement>; (tagname: "acronym"): NodeListOf<HTMLElement>; (tagname: "address"): NodeListOf<HTMLElement>; (tagname: "applet"): NodeListOf<HTMLAppletElement>; (tagname: "area"): NodeListOf<HTMLAreaElement>; (tagname: "article"): NodeListOf<HTMLElement>; (tagname: "aside"): NodeListOf<HTMLElement>; (tagname: "audio"): NodeListOf<HTMLAudioElement>; (tagname: "b"): NodeListOf<HTMLElement>; (tagname: "base"): NodeListOf<HTMLBaseElement>; (tagname: "basefont"): NodeListOf<HTMLBaseFontElement>; (tagname: "bdo"): NodeListOf<HTMLElement>; (tagname: "big"): NodeListOf<HTMLElement>; (tagname: "blockquote"): NodeListOf<HTMLQuoteElement>; (tagname: "body"): NodeListOf<HTMLBodyElement>; (tagname: "br"): NodeListOf<HTMLBRElement>; (tagname: "button"): NodeListOf<HTMLButtonElement>; (tagname: "canvas"): NodeListOf<HTMLCanvasElement>; (tagname: "caption"): NodeListOf<HTMLTableCaptionElement>; (tagname: "center"): NodeListOf<HTMLElement>; (tagname: "circle"): NodeListOf<SVGCircleElement>; (tagname: "cite"): NodeListOf<HTMLElement>; (tagname: "clippath"): NodeListOf<SVGClipPathElement>; (tagname: "code"): NodeListOf<HTMLElement>; (tagname: "col"): NodeListOf<HTMLTableColElement>; (tagname: "colgroup"): NodeListOf<HTMLTableColElement>; (tagname: "datalist"): NodeListOf<HTMLDataListElement>; (tagname: "dd"): NodeListOf<HTMLElement>; (tagname: "defs"): NodeListOf<SVGDefsElement>; (tagname: "del"): NodeListOf<HTMLModElement>; (tagname: "desc"): NodeListOf<SVGDescElement>; (tagname: "dfn"): NodeListOf<HTMLElement>; (tagname: "dir"): NodeListOf<HTMLDirectoryElement>; (tagname: "div"): NodeListOf<HTMLDivElement>; (tagname: "dl"): NodeListOf<HTMLDListElement>; (tagname: "dt"): NodeListOf<HTMLElement>; (tagname: "ellipse"): NodeListOf<SVGEllipseElement>; (tagname: "em"): NodeListOf<HTMLElement>; (tagname: "embed"): NodeListOf<HTMLEmbedElement>; (tagname: "feblend"): NodeListOf<SVGFEBlendElement>; (tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>; (tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>; (tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>; (tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>; (tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>; (tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>; (tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>; (tagname: "feflood"): NodeListOf<SVGFEFloodElement>; (tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>; (tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>; (tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>; (tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>; (tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>; (tagname: "feimage"): NodeListOf<SVGFEImageElement>; (tagname: "femerge"): NodeListOf<SVGFEMergeElement>; (tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>; (tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>; (tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>; (tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>; (tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>; (tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>; (tagname: "fetile"): NodeListOf<SVGFETileElement>; (tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>; (tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>; (tagname: "figcaption"): NodeListOf<HTMLElement>; (tagname: "figure"): NodeListOf<HTMLElement>; (tagname: "filter"): NodeListOf<SVGFilterElement>; (tagname: "font"): NodeListOf<HTMLFontElement>; (tagname: "footer"): NodeListOf<HTMLElement>; (tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>; (tagname: "form"): NodeListOf<HTMLFormElement>; (tagname: "frame"): NodeListOf<HTMLFrameElement>; (tagname: "frameset"): NodeListOf<HTMLFrameSetElement>; (tagname: "g"): NodeListOf<SVGGElement>; (tagname: "h1"): NodeListOf<HTMLHeadingElement>; (tagname: "h2"): NodeListOf<HTMLHeadingElement>; (tagname: "h3"): NodeListOf<HTMLHeadingElement>; (tagname: "h4"): NodeListOf<HTMLHeadingElement>; (tagname: "h5"): NodeListOf<HTMLHeadingElement>; (tagname: "h6"): NodeListOf<HTMLHeadingElement>; (tagname: "head"): NodeListOf<HTMLHeadElement>; (tagname: "header"): NodeListOf<HTMLElement>; (tagname: "hgroup"): NodeListOf<HTMLElement>; (tagname: "hr"): NodeListOf<HTMLHRElement>; (tagname: "html"): NodeListOf<HTMLHtmlElement>; (tagname: "i"): NodeListOf<HTMLElement>; (tagname: "iframe"): NodeListOf<HTMLIFrameElement>; (tagname: "image"): NodeListOf<SVGImageElement>; (tagname: "img"): NodeListOf<HTMLImageElement>; (tagname: "input"): NodeListOf<HTMLInputElement>; (tagname: "ins"): NodeListOf<HTMLModElement>; (tagname: "isindex"): NodeListOf<HTMLUnknownElement>; (tagname: "kbd"): NodeListOf<HTMLElement>; (tagname: "keygen"): NodeListOf<HTMLElement>; (tagname: "label"): NodeListOf<HTMLLabelElement>; (tagname: "legend"): NodeListOf<HTMLLegendElement>; (tagname: "li"): NodeListOf<HTMLLIElement>; (tagname: "line"): NodeListOf<SVGLineElement>; (tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>; (tagname: "link"): NodeListOf<HTMLLinkElement>; (tagname: "listing"): NodeListOf<HTMLPreElement>; (tagname: "map"): NodeListOf<HTMLMapElement>; (tagname: "mark"): NodeListOf<HTMLElement>; (tagname: "marker"): NodeListOf<SVGMarkerElement>; (tagname: "marquee"): NodeListOf<HTMLMarqueeElement>; (tagname: "mask"): NodeListOf<SVGMaskElement>; (tagname: "menu"): NodeListOf<HTMLMenuElement>; (tagname: "meta"): NodeListOf<HTMLMetaElement>; (tagname: "metadata"): NodeListOf<SVGMetadataElement>; (tagname: "meter"): NodeListOf<HTMLMeterElement>; (tagname: "nav"): NodeListOf<HTMLElement>; (tagname: "nextid"): NodeListOf<HTMLUnknownElement>; (tagname: "nobr"): NodeListOf<HTMLElement>; (tagname: "noframes"): NodeListOf<HTMLElement>; (tagname: "noscript"): NodeListOf<HTMLElement>; (tagname: "object"): NodeListOf<HTMLObjectElement>; (tagname: "ol"): NodeListOf<HTMLOListElement>; (tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>; (tagname: "option"): NodeListOf<HTMLOptionElement>; (tagname: "p"): NodeListOf<HTMLParagraphElement>; (tagname: "param"): NodeListOf<HTMLParamElement>; (tagname: "path"): NodeListOf<SVGPathElement>; (tagname: "pattern"): NodeListOf<SVGPatternElement>; (tagname: "picture"): NodeListOf<HTMLPictureElement>; (tagname: "plaintext"): NodeListOf<HTMLElement>; (tagname: "polygon"): NodeListOf<SVGPolygonElement>; (tagname: "polyline"): NodeListOf<SVGPolylineElement>; (tagname: "pre"): NodeListOf<HTMLPreElement>; (tagname: "progress"): NodeListOf<HTMLProgressElement>; (tagname: "q"): NodeListOf<HTMLQuoteElement>; (tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>; (tagname: "rect"): NodeListOf<SVGRectElement>; (tagname: "rt"): NodeListOf<HTMLElement>; (tagname: "ruby"): NodeListOf<HTMLElement>; (tagname: "s"): NodeListOf<HTMLElement>; (tagname: "samp"): NodeListOf<HTMLElement>; (tagname: "script"): NodeListOf<HTMLScriptElement>; (tagname: "section"): NodeListOf<HTMLElement>; (tagname: "select"): NodeListOf<HTMLSelectElement>; (tagname: "small"): NodeListOf<HTMLElement>; (tagname: "source"): NodeListOf<HTMLSourceElement>; (tagname: "span"): NodeListOf<HTMLSpanElement>; (tagname: "stop"): NodeListOf<SVGStopElement>; (tagname: "strike"): NodeListOf<HTMLElement>; (tagname: "strong"): NodeListOf<HTMLElement>; (tagname: "style"): NodeListOf<HTMLStyleElement>; (tagname: "sub"): NodeListOf<HTMLElement>; (tagname: "sup"): NodeListOf<HTMLElement>; (tagname: "svg"): NodeListOf<SVGSVGElement>; (tagname: "switch"): NodeListOf<SVGSwitchElement>; (tagname: "symbol"): NodeListOf<SVGSymbolElement>; (tagname: "table"): NodeListOf<HTMLTableElement>; (tagname: "tbody"): NodeListOf<HTMLTableSectionElement>; (tagname: "td"): NodeListOf<HTMLTableDataCellElement>; (tagname: "template"): NodeListOf<HTMLTemplateElement>; (tagname: "text"): NodeListOf<SVGTextElement>; (tagname: "textpath"): NodeListOf<SVGTextPathElement>; (tagname: "textarea"): NodeListOf<HTMLTextAreaElement>; (tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>; (tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>; (tagname: "thead"): NodeListOf<HTMLTableSectionElement>; (tagname: "title"): NodeListOf<HTMLTitleElement>; (tagname: "tr"): NodeListOf<HTMLTableRowElement>; (tagname: "track"): NodeListOf<HTMLTrackElement>; (tagname: "tspan"): NodeListOf<SVGTSpanElement>; (tagname: "tt"): NodeListOf<HTMLElement>; (tagname: "u"): NodeListOf<HTMLElement>; (tagname: "ul"): NodeListOf<HTMLUListElement>; (tagname: "use"): NodeListOf<SVGUseElement>; (tagname: "var"): NodeListOf<HTMLElement>; (tagname: "video"): NodeListOf<HTMLVideoElement>; (tagname: "view"): NodeListOf<SVGViewElement>; (tagname: "wbr"): NodeListOf<HTMLElement>; (tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>; (tagname: "xmp"): NodeListOf<HTMLPreElement>; (tagname: string): NodeListOf<Element>; }
+>document.getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >document : Document
->getElementsByTagName : { (tagname: "a"): NodeListOf<HTMLAnchorElement>; (tagname: "abbr"): NodeListOf<HTMLElement>; (tagname: "acronym"): NodeListOf<HTMLElement>; (tagname: "address"): NodeListOf<HTMLElement>; (tagname: "applet"): NodeListOf<HTMLAppletElement>; (tagname: "area"): NodeListOf<HTMLAreaElement>; (tagname: "article"): NodeListOf<HTMLElement>; (tagname: "aside"): NodeListOf<HTMLElement>; (tagname: "audio"): NodeListOf<HTMLAudioElement>; (tagname: "b"): NodeListOf<HTMLElement>; (tagname: "base"): NodeListOf<HTMLBaseElement>; (tagname: "basefont"): NodeListOf<HTMLBaseFontElement>; (tagname: "bdo"): NodeListOf<HTMLElement>; (tagname: "big"): NodeListOf<HTMLElement>; (tagname: "blockquote"): NodeListOf<HTMLQuoteElement>; (tagname: "body"): NodeListOf<HTMLBodyElement>; (tagname: "br"): NodeListOf<HTMLBRElement>; (tagname: "button"): NodeListOf<HTMLButtonElement>; (tagname: "canvas"): NodeListOf<HTMLCanvasElement>; (tagname: "caption"): NodeListOf<HTMLTableCaptionElement>; (tagname: "center"): NodeListOf<HTMLElement>; (tagname: "circle"): NodeListOf<SVGCircleElement>; (tagname: "cite"): NodeListOf<HTMLElement>; (tagname: "clippath"): NodeListOf<SVGClipPathElement>; (tagname: "code"): NodeListOf<HTMLElement>; (tagname: "col"): NodeListOf<HTMLTableColElement>; (tagname: "colgroup"): NodeListOf<HTMLTableColElement>; (tagname: "datalist"): NodeListOf<HTMLDataListElement>; (tagname: "dd"): NodeListOf<HTMLElement>; (tagname: "defs"): NodeListOf<SVGDefsElement>; (tagname: "del"): NodeListOf<HTMLModElement>; (tagname: "desc"): NodeListOf<SVGDescElement>; (tagname: "dfn"): NodeListOf<HTMLElement>; (tagname: "dir"): NodeListOf<HTMLDirectoryElement>; (tagname: "div"): NodeListOf<HTMLDivElement>; (tagname: "dl"): NodeListOf<HTMLDListElement>; (tagname: "dt"): NodeListOf<HTMLElement>; (tagname: "ellipse"): NodeListOf<SVGEllipseElement>; (tagname: "em"): NodeListOf<HTMLElement>; (tagname: "embed"): NodeListOf<HTMLEmbedElement>; (tagname: "feblend"): NodeListOf<SVGFEBlendElement>; (tagname: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>; (tagname: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>; (tagname: "fecomposite"): NodeListOf<SVGFECompositeElement>; (tagname: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>; (tagname: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>; (tagname: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>; (tagname: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>; (tagname: "feflood"): NodeListOf<SVGFEFloodElement>; (tagname: "fefunca"): NodeListOf<SVGFEFuncAElement>; (tagname: "fefuncb"): NodeListOf<SVGFEFuncBElement>; (tagname: "fefuncg"): NodeListOf<SVGFEFuncGElement>; (tagname: "fefuncr"): NodeListOf<SVGFEFuncRElement>; (tagname: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>; (tagname: "feimage"): NodeListOf<SVGFEImageElement>; (tagname: "femerge"): NodeListOf<SVGFEMergeElement>; (tagname: "femergenode"): NodeListOf<SVGFEMergeNodeElement>; (tagname: "femorphology"): NodeListOf<SVGFEMorphologyElement>; (tagname: "feoffset"): NodeListOf<SVGFEOffsetElement>; (tagname: "fepointlight"): NodeListOf<SVGFEPointLightElement>; (tagname: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>; (tagname: "fespotlight"): NodeListOf<SVGFESpotLightElement>; (tagname: "fetile"): NodeListOf<SVGFETileElement>; (tagname: "feturbulence"): NodeListOf<SVGFETurbulenceElement>; (tagname: "fieldset"): NodeListOf<HTMLFieldSetElement>; (tagname: "figcaption"): NodeListOf<HTMLElement>; (tagname: "figure"): NodeListOf<HTMLElement>; (tagname: "filter"): NodeListOf<SVGFilterElement>; (tagname: "font"): NodeListOf<HTMLFontElement>; (tagname: "footer"): NodeListOf<HTMLElement>; (tagname: "foreignobject"): NodeListOf<SVGForeignObjectElement>; (tagname: "form"): NodeListOf<HTMLFormElement>; (tagname: "frame"): NodeListOf<HTMLFrameElement>; (tagname: "frameset"): NodeListOf<HTMLFrameSetElement>; (tagname: "g"): NodeListOf<SVGGElement>; (tagname: "h1"): NodeListOf<HTMLHeadingElement>; (tagname: "h2"): NodeListOf<HTMLHeadingElement>; (tagname: "h3"): NodeListOf<HTMLHeadingElement>; (tagname: "h4"): NodeListOf<HTMLHeadingElement>; (tagname: "h5"): NodeListOf<HTMLHeadingElement>; (tagname: "h6"): NodeListOf<HTMLHeadingElement>; (tagname: "head"): NodeListOf<HTMLHeadElement>; (tagname: "header"): NodeListOf<HTMLElement>; (tagname: "hgroup"): NodeListOf<HTMLElement>; (tagname: "hr"): NodeListOf<HTMLHRElement>; (tagname: "html"): NodeListOf<HTMLHtmlElement>; (tagname: "i"): NodeListOf<HTMLElement>; (tagname: "iframe"): NodeListOf<HTMLIFrameElement>; (tagname: "image"): NodeListOf<SVGImageElement>; (tagname: "img"): NodeListOf<HTMLImageElement>; (tagname: "input"): NodeListOf<HTMLInputElement>; (tagname: "ins"): NodeListOf<HTMLModElement>; (tagname: "isindex"): NodeListOf<HTMLUnknownElement>; (tagname: "kbd"): NodeListOf<HTMLElement>; (tagname: "keygen"): NodeListOf<HTMLElement>; (tagname: "label"): NodeListOf<HTMLLabelElement>; (tagname: "legend"): NodeListOf<HTMLLegendElement>; (tagname: "li"): NodeListOf<HTMLLIElement>; (tagname: "line"): NodeListOf<SVGLineElement>; (tagname: "lineargradient"): NodeListOf<SVGLinearGradientElement>; (tagname: "link"): NodeListOf<HTMLLinkElement>; (tagname: "listing"): NodeListOf<HTMLPreElement>; (tagname: "map"): NodeListOf<HTMLMapElement>; (tagname: "mark"): NodeListOf<HTMLElement>; (tagname: "marker"): NodeListOf<SVGMarkerElement>; (tagname: "marquee"): NodeListOf<HTMLMarqueeElement>; (tagname: "mask"): NodeListOf<SVGMaskElement>; (tagname: "menu"): NodeListOf<HTMLMenuElement>; (tagname: "meta"): NodeListOf<HTMLMetaElement>; (tagname: "metadata"): NodeListOf<SVGMetadataElement>; (tagname: "meter"): NodeListOf<HTMLMeterElement>; (tagname: "nav"): NodeListOf<HTMLElement>; (tagname: "nextid"): NodeListOf<HTMLUnknownElement>; (tagname: "nobr"): NodeListOf<HTMLElement>; (tagname: "noframes"): NodeListOf<HTMLElement>; (tagname: "noscript"): NodeListOf<HTMLElement>; (tagname: "object"): NodeListOf<HTMLObjectElement>; (tagname: "ol"): NodeListOf<HTMLOListElement>; (tagname: "optgroup"): NodeListOf<HTMLOptGroupElement>; (tagname: "option"): NodeListOf<HTMLOptionElement>; (tagname: "p"): NodeListOf<HTMLParagraphElement>; (tagname: "param"): NodeListOf<HTMLParamElement>; (tagname: "path"): NodeListOf<SVGPathElement>; (tagname: "pattern"): NodeListOf<SVGPatternElement>; (tagname: "picture"): NodeListOf<HTMLPictureElement>; (tagname: "plaintext"): NodeListOf<HTMLElement>; (tagname: "polygon"): NodeListOf<SVGPolygonElement>; (tagname: "polyline"): NodeListOf<SVGPolylineElement>; (tagname: "pre"): NodeListOf<HTMLPreElement>; (tagname: "progress"): NodeListOf<HTMLProgressElement>; (tagname: "q"): NodeListOf<HTMLQuoteElement>; (tagname: "radialgradient"): NodeListOf<SVGRadialGradientElement>; (tagname: "rect"): NodeListOf<SVGRectElement>; (tagname: "rt"): NodeListOf<HTMLElement>; (tagname: "ruby"): NodeListOf<HTMLElement>; (tagname: "s"): NodeListOf<HTMLElement>; (tagname: "samp"): NodeListOf<HTMLElement>; (tagname: "script"): NodeListOf<HTMLScriptElement>; (tagname: "section"): NodeListOf<HTMLElement>; (tagname: "select"): NodeListOf<HTMLSelectElement>; (tagname: "small"): NodeListOf<HTMLElement>; (tagname: "source"): NodeListOf<HTMLSourceElement>; (tagname: "span"): NodeListOf<HTMLSpanElement>; (tagname: "stop"): NodeListOf<SVGStopElement>; (tagname: "strike"): NodeListOf<HTMLElement>; (tagname: "strong"): NodeListOf<HTMLElement>; (tagname: "style"): NodeListOf<HTMLStyleElement>; (tagname: "sub"): NodeListOf<HTMLElement>; (tagname: "sup"): NodeListOf<HTMLElement>; (tagname: "svg"): NodeListOf<SVGSVGElement>; (tagname: "switch"): NodeListOf<SVGSwitchElement>; (tagname: "symbol"): NodeListOf<SVGSymbolElement>; (tagname: "table"): NodeListOf<HTMLTableElement>; (tagname: "tbody"): NodeListOf<HTMLTableSectionElement>; (tagname: "td"): NodeListOf<HTMLTableDataCellElement>; (tagname: "template"): NodeListOf<HTMLTemplateElement>; (tagname: "text"): NodeListOf<SVGTextElement>; (tagname: "textpath"): NodeListOf<SVGTextPathElement>; (tagname: "textarea"): NodeListOf<HTMLTextAreaElement>; (tagname: "tfoot"): NodeListOf<HTMLTableSectionElement>; (tagname: "th"): NodeListOf<HTMLTableHeaderCellElement>; (tagname: "thead"): NodeListOf<HTMLTableSectionElement>; (tagname: "title"): NodeListOf<HTMLTitleElement>; (tagname: "tr"): NodeListOf<HTMLTableRowElement>; (tagname: "track"): NodeListOf<HTMLTrackElement>; (tagname: "tspan"): NodeListOf<SVGTSpanElement>; (tagname: "tt"): NodeListOf<HTMLElement>; (tagname: "u"): NodeListOf<HTMLElement>; (tagname: "ul"): NodeListOf<HTMLUListElement>; (tagname: "use"): NodeListOf<SVGUseElement>; (tagname: "var"): NodeListOf<HTMLElement>; (tagname: "video"): NodeListOf<HTMLVideoElement>; (tagname: "view"): NodeListOf<SVGViewElement>; (tagname: "wbr"): NodeListOf<HTMLElement>; (tagname: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>; (tagname: "xmp"): NodeListOf<HTMLPreElement>; (tagname: string): NodeListOf<Element>; }
+>getElementsByTagName : { <K extends "a" | "abbr" | "acronym" | "address" | "applet" | "area" | "article" | "aside" | "audio" | "b" | "base" | "basefont" | "bdo" | "big" | "blockquote" | "body" | "br" | "button" | "canvas" | "caption" | "center" | "circle" | "cite" | "clippath" | "code" | "col" | "colgroup" | "datalist" | "dd" | "defs" | "del" | "desc" | "dfn" | "dir" | "div" | "dl" | "dt" | "ellipse" | "em" | "embed" | "feblend" | "fecolormatrix" | "fecomponenttransfer" | "fecomposite" | "feconvolvematrix" | "fediffuselighting" | "fedisplacementmap" | "fedistantlight" | "feflood" | "fefunca" | "fefuncb" | "fefuncg" | "fefuncr" | "fegaussianblur" | "feimage" | "femerge" | "femergenode" | "femorphology" | "feoffset" | "fepointlight" | "fespecularlighting" | "fespotlight" | "fetile" | "feturbulence" | "fieldset" | "figcaption" | "figure" | "filter" | "font" | "footer" | "foreignobject" | "form" | "frame" | "frameset" | "g" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "head" | "header" | "hgroup" | "hr" | "html" | "i" | "iframe" | "image" | "img" | "input" | "ins" | "isindex" | "kbd" | "keygen" | "label" | "legend" | "li" | "line" | "lineargradient" | "link" | "listing" | "map" | "mark" | "marker" | "marquee" | "mask" | "menu" | "meta" | "metadata" | "meter" | "nav" | "nextid" | "nobr" | "noframes" | "noscript" | "object" | "ol" | "optgroup" | "option" | "p" | "param" | "path" | "pattern" | "picture" | "plaintext" | "polygon" | "polyline" | "pre" | "progress" | "q" | "radialgradient" | "rect" | "rt" | "ruby" | "s" | "samp" | "script" | "section" | "select" | "small" | "source" | "span" | "stop" | "strike" | "strong" | "style" | "sub" | "sup" | "svg" | "switch" | "symbol" | "table" | "tbody" | "td" | "template" | "text" | "textpath" | "textarea" | "tfoot" | "th" | "thead" | "title" | "tr" | "track" | "tspan" | "tt" | "u" | "ul" | "use" | "var" | "video" | "view" | "wbr" | "x-ms-webview" | "xmp">(tagname: K): ElementListTagNameMap[K]; (tagname: string): NodeListOf<Element>; }
 >"a" : "a"
 
     element.href;
diff --git a/tests/baselines/reference/objectFreeze.errors.txt b/tests/baselines/reference/objectFreeze.errors.txt
new file mode 100644
index 00000000000..9c28c62f534
--- /dev/null
+++ b/tests/baselines/reference/objectFreeze.errors.txt
@@ -0,0 +1,22 @@
+tests/cases/compiler/objectFreeze.ts(9,1): error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
+tests/cases/compiler/objectFreeze.ts(12,3): error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
+
+
+==== tests/cases/compiler/objectFreeze.ts (2 errors) ====
+    const f = Object.freeze(function foo(a: number, b: string) { return false; });
+    f(1, "") === false;
+    
+    class C { constructor(a: number) { } }
+    const c = Object.freeze(C);
+    new c(1);
+    
+    const a = Object.freeze([1, 2, 3]);
+    a[0] = a[2].toString();
+    ~~~~
+!!! error TS2542: Index signature in type 'ReadonlyArray<number>' only permits reading.
+    
+    const o = Object.freeze({ a: 1, b: "string" });
+    o.b = o.a.toString();
+      ~
+!!! error TS2540: Cannot assign to 'b' because it is a constant or a read-only property.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/objectFreeze.js b/tests/baselines/reference/objectFreeze.js
new file mode 100644
index 00000000000..4c37631bb10
--- /dev/null
+++ b/tests/baselines/reference/objectFreeze.js
@@ -0,0 +1,29 @@
+//// [objectFreeze.ts]
+const f = Object.freeze(function foo(a: number, b: string) { return false; });
+f(1, "") === false;
+
+class C { constructor(a: number) { } }
+const c = Object.freeze(C);
+new c(1);
+
+const a = Object.freeze([1, 2, 3]);
+a[0] = a[2].toString();
+
+const o = Object.freeze({ a: 1, b: "string" });
+o.b = o.a.toString();
+
+
+//// [objectFreeze.js]
+var f = Object.freeze(function foo(a, b) { return false; });
+f(1, "") === false;
+var C = (function () {
+    function C(a) {
+    }
+    return C;
+}());
+var c = Object.freeze(C);
+new c(1);
+var a = Object.freeze([1, 2, 3]);
+a[0] = a[2].toString();
+var o = Object.freeze({ a: 1, b: "string" });
+o.b = o.a.toString();
diff --git a/tests/baselines/reference/objectRest.js b/tests/baselines/reference/objectRest.js
index 85d8a6a573e..e6d45c7a98a 100644
--- a/tests/baselines/reference/objectRest.js
+++ b/tests/baselines/reference/objectRest.js
@@ -43,7 +43,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestAssignment.js b/tests/baselines/reference/objectRestAssignment.js
index 66ee00f6696..cbdff663c26 100644
--- a/tests/baselines/reference/objectRestAssignment.js
+++ b/tests/baselines/reference/objectRestAssignment.js
@@ -19,7 +19,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestForOf.js b/tests/baselines/reference/objectRestForOf.js
index b4e33550cb0..fd81f77512e 100644
--- a/tests/baselines/reference/objectRestForOf.js
+++ b/tests/baselines/reference/objectRestForOf.js
@@ -27,7 +27,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestNegative.js b/tests/baselines/reference/objectRestNegative.js
index f8c5b72ada5..915e0a0e867 100644
--- a/tests/baselines/reference/objectRestNegative.js
+++ b/tests/baselines/reference/objectRestNegative.js
@@ -23,7 +23,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectRestParameter.js b/tests/baselines/reference/objectRestParameter.js
index 87419bd06e9..14e84eddfce 100644
--- a/tests/baselines/reference/objectRestParameter.js
+++ b/tests/baselines/reference/objectRestParameter.js
@@ -22,7 +22,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
         t[p] = s[p];
-    if (typeof Object.getOwnPropertySymbols === "function")
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
         for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
             t[p[i]] = s[p[i]];
     return t;
diff --git a/tests/baselines/reference/objectSpreadNegative.errors.txt b/tests/baselines/reference/objectSpreadNegative.errors.txt
index dc6a356708f..17f07bc06a2 100644
--- a/tests/baselines/reference/objectSpreadNegative.errors.txt
+++ b/tests/baselines/reference/objectSpreadNegative.errors.txt
@@ -7,20 +7,18 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(25,1): error TS2322
   Property 's' is missing in type '{ b: boolean; }'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,36): error TS2300: Duplicate identifier 'b'.
 tests/cases/conformance/types/spread/objectSpreadNegative.ts(28,53): error TS2300: Duplicate identifier 'b'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,20): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(33,24): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(34,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,20): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(39,19): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(44,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(48,12): error TS2339: Property 'b' does not exist on type '{}'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(54,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(58,14): error TS2698: Spread types may only be created from object types.
-tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(32,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(33,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(35,20): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(37,19): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(42,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type '{}' has no compatible call signatures.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(46,12): error TS2339: Property 'b' does not exist on type '{}'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(52,9): error TS2339: Property 'm' does not exist on type '{ p: number; }'.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(56,14): error TS2698: Spread types may only be created from object types.
+tests/cases/conformance/types/spread/objectSpreadNegative.ts(59,14): error TS2698: Spread types may only be created from object types.
 
 
-==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (17 errors) ====
+==== tests/cases/conformance/types/spread/objectSpreadNegative.ts (15 errors) ====
     let o = { a: 1, b: 'no' }
     
     /// private propagates
@@ -66,13 +64,7 @@ tests/cases/conformance/types/spread/objectSpreadNegative.ts(61,14): error TS269
 !!! error TS2300: Duplicate identifier 'b'.
     let duplicatedSpread = { ...o, ...o }
     
-    // null, undefined and primitives are not allowed
-    let spreadNull = { ...null };
-                       ~~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
-    let spreadUndefind = { ...undefined };
-                           ~~~~~~~~~~~~
-!!! error TS2698: Spread types may only be created from object types.
+    // primitives are not allowed
     let spreadNum = { ...12 };
                       ~~~~~
 !!! error TS2698: Spread types may only be created from object types.
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 6287f4559a7..dff84355370 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -29,9 +29,7 @@ spread = b; // error, missing 's'
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null, undefined and primitives are not allowed
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
+// primitives are not allowed
 let spreadNum = { ...12 };
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
@@ -108,9 +106,7 @@ spread = b; // error, missing 's'
 // literal repeats are not allowed, but spread repeats are fine
 var duplicated = __assign({ b: 'bad' }, o, { b: 'bad' }, o2, { b: 'bad' });
 var duplicatedSpread = __assign({}, o, o);
-// null, undefined and primitives are not allowed
-var spreadNull = __assign({}, null);
-var spreadUndefind = __assign({}, undefined);
+// primitives are not allowed
 var spreadNum = __assign({}, 12);
 var spreadSum = __assign({}, 1 + 1);
 spreadSum.toFixed(); // error, no methods from number
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.errors.txt b/tests/baselines/reference/parserES5ForOfStatement19.errors.txt
deleted file mode 100644
index 9d0bb02f1ef..00000000000
--- a/tests/baselines/reference/parserES5ForOfStatement19.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts(1,16): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-
-
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts (1 errors) ====
-    for (var of in of) { }
-                   ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.symbols b/tests/baselines/reference/parserES5ForOfStatement19.symbols
new file mode 100644
index 00000000000..93ba77e3db9
--- /dev/null
+++ b/tests/baselines/reference/parserES5ForOfStatement19.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts ===
+for (var of in of) { }
+>of : Symbol(of, Decl(parserES5ForOfStatement19.ts, 0, 8))
+>of : Symbol(of, Decl(parserES5ForOfStatement19.ts, 0, 8))
+
diff --git a/tests/baselines/reference/parserES5ForOfStatement19.types b/tests/baselines/reference/parserES5ForOfStatement19.types
new file mode 100644
index 00000000000..13abc7ae757
--- /dev/null
+++ b/tests/baselines/reference/parserES5ForOfStatement19.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement19.ts ===
+for (var of in of) { }
+>of : any
+>of : any
+
diff --git a/tests/baselines/reference/parserES5ForOfStatement20.errors.txt b/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
index 2bfc54590ad..4aee32394b6 100644
--- a/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
+++ b/tests/baselines/reference/parserES5ForOfStatement20.errors.txt
@@ -1,10 +1,7 @@
 tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts(1,20): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserES5ForOfStatement20.ts (1 errors) ====
     for (var of = 0 in of) { }
              ~~
-!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-                       ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
+!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement19.errors.txt b/tests/baselines/reference/parserForOfStatement19.errors.txt
deleted file mode 100644
index a111498efe7..00000000000
--- a/tests/baselines/reference/parserForOfStatement19.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts(1,16): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-
-
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts (1 errors) ====
-    for (var of in of) { }
-                   ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForOfStatement19.symbols b/tests/baselines/reference/parserForOfStatement19.symbols
new file mode 100644
index 00000000000..1e123349e13
--- /dev/null
+++ b/tests/baselines/reference/parserForOfStatement19.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts ===
+for (var of in of) { }
+>of : Symbol(of, Decl(parserForOfStatement19.ts, 0, 8))
+>of : Symbol(of, Decl(parserForOfStatement19.ts, 0, 8))
+
diff --git a/tests/baselines/reference/parserForOfStatement19.types b/tests/baselines/reference/parserForOfStatement19.types
new file mode 100644
index 00000000000..6fcc5e8f792
--- /dev/null
+++ b/tests/baselines/reference/parserForOfStatement19.types
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement19.ts ===
+for (var of in of) { }
+>of : any
+>of : any
+
diff --git a/tests/baselines/reference/parserForOfStatement20.errors.txt b/tests/baselines/reference/parserForOfStatement20.errors.txt
index f2b6ac39a83..461f307f6b9 100644
--- a/tests/baselines/reference/parserForOfStatement20.errors.txt
+++ b/tests/baselines/reference/parserForOfStatement20.errors.txt
@@ -1,10 +1,7 @@
 tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts(1,10): error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts(1,20): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 
 
-==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript6/Iterators/parserForOfStatement20.ts (1 errors) ====
     for (var of = 0 in of) { }
              ~~
-!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
-                       ~~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
\ No newline at end of file
+!!! error TS1189: The variable declaration of a 'for...in' statement cannot have an initializer.
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveLetConst.errors.txt b/tests/baselines/reference/recursiveLetConst.errors.txt
index 6d3f15880bb..88ecb379e5e 100644
--- a/tests/baselines/reference/recursiveLetConst.errors.txt
+++ b/tests/baselines/reference/recursiveLetConst.errors.txt
@@ -5,14 +5,13 @@ tests/cases/compiler/recursiveLetConst.ts(5,14): error TS2448: Block-scoped vari
 tests/cases/compiler/recursiveLetConst.ts(6,14): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(7,1): error TS7027: Unreachable code detected.
 tests/cases/compiler/recursiveLetConst.ts(7,16): error TS2448: Block-scoped variable 'v' used before its declaration.
-tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/recursiveLetConst.ts(8,15): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(9,15): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(10,17): error TS2448: Block-scoped variable 'v' used before its declaration.
 tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped variable 'x2' used before its declaration.
 
 
-==== tests/cases/compiler/recursiveLetConst.ts (12 errors) ====
+==== tests/cases/compiler/recursiveLetConst.ts (11 errors) ====
     'use strict'
     let x = x + 1;
             ~
@@ -36,8 +35,6 @@ tests/cases/compiler/recursiveLetConst.ts(11,11): error TS2448: Block-scoped var
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let v in v) { }
                   ~
-!!! error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
-                  ~
 !!! error TS2448: Block-scoped variable 'v' used before its declaration.
     for (let v of v) { }
                   ~
diff --git a/tests/baselines/reference/restIntersection.js b/tests/baselines/reference/restIntersection.js
new file mode 100644
index 00000000000..d1f9aa3094c
--- /dev/null
+++ b/tests/baselines/reference/restIntersection.js
@@ -0,0 +1,20 @@
+//// [restIntersection.ts]
+var intersection: { x: number, y: number } & { w: string, z: string };
+
+var rest1: { y: number, w: string, z: string };
+var {x, ...rest1 } = intersection;
+
+
+//// [restIntersection.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var intersection;
+var rest1;
+var x = intersection.x, rest1 = __rest(intersection, ["x"]);
diff --git a/tests/baselines/reference/restIntersection.symbols b/tests/baselines/reference/restIntersection.symbols
new file mode 100644
index 00000000000..75f91d243e2
--- /dev/null
+++ b/tests/baselines/reference/restIntersection.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/restIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : Symbol(intersection, Decl(restIntersection.ts, 0, 3))
+>x : Symbol(x, Decl(restIntersection.ts, 0, 19))
+>y : Symbol(y, Decl(restIntersection.ts, 0, 30))
+>w : Symbol(w, Decl(restIntersection.ts, 0, 46))
+>z : Symbol(z, Decl(restIntersection.ts, 0, 57))
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : Symbol(rest1, Decl(restIntersection.ts, 2, 3), Decl(restIntersection.ts, 3, 7))
+>y : Symbol(y, Decl(restIntersection.ts, 2, 12))
+>w : Symbol(w, Decl(restIntersection.ts, 2, 23))
+>z : Symbol(z, Decl(restIntersection.ts, 2, 34))
+
+var {x, ...rest1 } = intersection;
+>x : Symbol(x, Decl(restIntersection.ts, 3, 5))
+>rest1 : Symbol(rest1, Decl(restIntersection.ts, 2, 3), Decl(restIntersection.ts, 3, 7))
+>intersection : Symbol(intersection, Decl(restIntersection.ts, 0, 3))
+
diff --git a/tests/baselines/reference/restIntersection.types b/tests/baselines/reference/restIntersection.types
new file mode 100644
index 00000000000..5779349ba29
--- /dev/null
+++ b/tests/baselines/reference/restIntersection.types
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/restIntersection.ts ===
+var intersection: { x: number, y: number } & { w: string, z: string };
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+>x : number
+>y : number
+>w : string
+>z : string
+
+var rest1: { y: number, w: string, z: string };
+>rest1 : { y: number; w: string; z: string; }
+>y : number
+>w : string
+>z : string
+
+var {x, ...rest1 } = intersection;
+>x : number
+>rest1 : { y: number; w: string; z: string; }
+>intersection : { x: number; y: number; } & { w: string; z: string; }
+
diff --git a/tests/baselines/reference/restInvalidArgumentType.errors.txt b/tests/baselines/reference/restInvalidArgumentType.errors.txt
new file mode 100644
index 00000000000..fff2c7b3563
--- /dev/null
+++ b/tests/baselines/reference/restInvalidArgumentType.errors.txt
@@ -0,0 +1,104 @@
+tests/cases/compiler/restInvalidArgumentType.ts(31,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(33,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(35,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(36,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(38,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(41,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(42,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(44,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(45,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(47,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(48,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(55,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(56,13): error TS2700: Rest types may only be created from object types.
+tests/cases/compiler/restInvalidArgumentType.ts(58,13): error TS2700: Rest types may only be created from object types.
+
+
+==== tests/cases/compiler/restInvalidArgumentType.ts (14 errors) ====
+    enum E { v1, v2 };
+    
+    function f<T extends { b: string }>(p1: T, p2: T[]) {
+        var t: T;
+    
+        var i: T["b"];
+        var k: keyof T;
+    
+        var mapped_generic: {[P in keyof T]: T[P]};
+        var mapped: {[P in "b"]: T[P]};
+    
+        var union_generic: T | { a: number };
+        var union_primitive: { a: number } | number;
+    
+        var intersection_generic: T & { a: number };
+        var intersection_premitive: { a: number } | string;
+    
+        var num: number;
+        var str: number;
+    
+        var u: undefined;
+        var n: null;
+    
+        var a: any;
+    
+        var literal_string: "string";
+        var literal_number: 42;
+    
+        var e: E;
+    
+        var {...r1} = p1;   // Error, generic type paramterre
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r2} = p2;   // OK
+        var {...r3} = t;   // Error, generic type paramter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r4} = i;   // Error, index access
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r5} = k;   // Error, index
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r6} = mapped_generic; // Error, generic mapped object type
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r7} = mapped;  // OK, non-generic mapped type
+    
+        var {...r8} = union_generic;  // Error, union with generic type parameter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r9} = union_primitive;  // Error, union with generic type parameter
+                ~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r12} = num;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r13} = str;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r14} = u;  // OK
+        var {...r15} = n;  // OK
+    
+        var {...r16} = a;  // OK
+    
+        var {...r17} = literal_string;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+        var {...r18} = literal_number;  // Error
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    
+        var {...r19} = e;  // Error, enum
+                ~~~
+!!! error TS2700: Rest types may only be created from object types.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/restInvalidArgumentType.js b/tests/baselines/reference/restInvalidArgumentType.js
new file mode 100644
index 00000000000..48e4e11e805
--- /dev/null
+++ b/tests/baselines/reference/restInvalidArgumentType.js
@@ -0,0 +1,115 @@
+//// [restInvalidArgumentType.ts]
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var {...r1} = p1;   // Error, generic type paramterre
+    var {...r2} = p2;   // OK
+    var {...r3} = t;   // Error, generic type paramter
+
+    var {...r4} = i;   // Error, index access
+    var {...r5} = k;   // Error, index
+
+    var {...r6} = mapped_generic; // Error, generic mapped object type
+    var {...r7} = mapped;  // OK, non-generic mapped type
+
+    var {...r8} = union_generic;  // Error, union with generic type parameter
+    var {...r9} = union_primitive;  // Error, union with generic type parameter
+
+    var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+    var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+
+    var {...r12} = num;  // Error
+    var {...r13} = str;  // Error
+
+    var {...r14} = u;  // OK
+    var {...r15} = n;  // OK
+
+    var {...r16} = a;  // OK
+
+    var {...r17} = literal_string;  // Error
+    var {...r18} = literal_number;  // Error
+
+    var {...r19} = e;  // Error, enum
+}
+
+//// [restInvalidArgumentType.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var E;
+(function (E) {
+    E[E["v1"] = 0] = "v1";
+    E[E["v2"] = 1] = "v2";
+})(E || (E = {}));
+;
+function f(p1, p2) {
+    var t;
+    var i;
+    var k;
+    var mapped_generic;
+    var mapped;
+    var union_generic;
+    var union_primitive;
+    var intersection_generic;
+    var intersection_premitive;
+    var num;
+    var str;
+    var u;
+    var n;
+    var a;
+    var literal_string;
+    var literal_number;
+    var e;
+    var r1 = __rest(p1, []); // Error, generic type paramterre
+    var r2 = __rest(p2, []); // OK
+    var r3 = __rest(t, []); // Error, generic type paramter
+    var r4 = __rest(i, []); // Error, index access
+    var r5 = __rest(k, []); // Error, index
+    var r6 = __rest(mapped_generic, []); // Error, generic mapped object type
+    var r7 = __rest(mapped, []); // OK, non-generic mapped type
+    var r8 = __rest(union_generic, []); // Error, union with generic type parameter
+    var r9 = __rest(union_primitive, []); // Error, union with generic type parameter
+    var r10 = __rest(intersection_generic, []); // Error, intersection with generic type parameter
+    var r11 = __rest(intersection_premitive, []); // Error, intersection with generic type parameter
+    var r12 = __rest(num, []); // Error
+    var r13 = __rest(str, []); // Error
+    var r14 = __rest(u, []); // OK
+    var r15 = __rest(n, []); // OK
+    var r16 = __rest(a, []); // OK
+    var r17 = __rest(literal_string, []); // Error
+    var r18 = __rest(literal_number, []); // Error
+    var r19 = __rest(e, []); // Error, enum
+}
diff --git a/tests/baselines/reference/restUnion.js b/tests/baselines/reference/restUnion.js
new file mode 100644
index 00000000000..09a6243d2a9
--- /dev/null
+++ b/tests/baselines/reference/restUnion.js
@@ -0,0 +1,36 @@
+//// [restUnion.ts]
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+var rest1: { c: boolean } | { b: string };
+var {a, ...rest1 } = union;
+
+
+var undefinedUnion: { n: number } | undefined;
+var rest2: {};
+var {n, ...rest2 } = undefinedUnion;
+
+
+var nullUnion: { n: number } | null;
+var rest3: {};
+var {n, ...rest3 } = nullUnion;
+
+
+//// [restUnion.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var union;
+var rest1;
+var a = union.a, rest1 = __rest(union, ["a"]);
+var undefinedUnion;
+var rest2;
+var n = undefinedUnion.n, rest2 = __rest(undefinedUnion, ["n"]);
+var nullUnion;
+var rest3;
+var n = nullUnion.n, rest3 = __rest(nullUnion, ["n"]);
diff --git a/tests/baselines/reference/restUnion.symbols b/tests/baselines/reference/restUnion.symbols
new file mode 100644
index 00000000000..660c85badb4
--- /dev/null
+++ b/tests/baselines/reference/restUnion.symbols
@@ -0,0 +1,44 @@
+=== tests/cases/compiler/restUnion.ts ===
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : Symbol(union, Decl(restUnion.ts, 0, 3))
+>a : Symbol(a, Decl(restUnion.ts, 0, 12))
+>c : Symbol(c, Decl(restUnion.ts, 0, 23))
+>a : Symbol(a, Decl(restUnion.ts, 0, 40))
+>b : Symbol(b, Decl(restUnion.ts, 0, 51))
+
+var rest1: { c: boolean } | { b: string };
+>rest1 : Symbol(rest1, Decl(restUnion.ts, 2, 3), Decl(restUnion.ts, 3, 7))
+>c : Symbol(c, Decl(restUnion.ts, 2, 12))
+>b : Symbol(b, Decl(restUnion.ts, 2, 29))
+
+var {a, ...rest1 } = union;
+>a : Symbol(a, Decl(restUnion.ts, 3, 5))
+>rest1 : Symbol(rest1, Decl(restUnion.ts, 2, 3), Decl(restUnion.ts, 3, 7))
+>union : Symbol(union, Decl(restUnion.ts, 0, 3))
+
+
+var undefinedUnion: { n: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion.ts, 6, 3))
+>n : Symbol(n, Decl(restUnion.ts, 6, 21))
+
+var rest2: {};
+>rest2 : Symbol(rest2, Decl(restUnion.ts, 7, 3), Decl(restUnion.ts, 8, 7))
+
+var {n, ...rest2 } = undefinedUnion;
+>n : Symbol(n, Decl(restUnion.ts, 8, 5), Decl(restUnion.ts, 13, 5))
+>rest2 : Symbol(rest2, Decl(restUnion.ts, 7, 3), Decl(restUnion.ts, 8, 7))
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion.ts, 6, 3))
+
+
+var nullUnion: { n: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(restUnion.ts, 11, 3))
+>n : Symbol(n, Decl(restUnion.ts, 11, 16))
+
+var rest3: {};
+>rest3 : Symbol(rest3, Decl(restUnion.ts, 12, 3), Decl(restUnion.ts, 13, 7))
+
+var {n, ...rest3 } = nullUnion;
+>n : Symbol(n, Decl(restUnion.ts, 8, 5), Decl(restUnion.ts, 13, 5))
+>rest3 : Symbol(rest3, Decl(restUnion.ts, 12, 3), Decl(restUnion.ts, 13, 7))
+>nullUnion : Symbol(nullUnion, Decl(restUnion.ts, 11, 3))
+
diff --git a/tests/baselines/reference/restUnion.types b/tests/baselines/reference/restUnion.types
new file mode 100644
index 00000000000..9837466684b
--- /dev/null
+++ b/tests/baselines/reference/restUnion.types
@@ -0,0 +1,45 @@
+=== tests/cases/compiler/restUnion.ts ===
+var union: { a: number, c: boolean } | { a: string, b: string };
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+>a : number
+>c : boolean
+>a : string
+>b : string
+
+var rest1: { c: boolean } | { b: string };
+>rest1 : { c: boolean; } | { b: string; }
+>c : boolean
+>b : string
+
+var {a, ...rest1 } = union;
+>a : string | number
+>rest1 : { c: boolean; } | { b: string; }
+>union : { a: number; c: boolean; } | { a: string; b: string; }
+
+
+var undefinedUnion: { n: number } | undefined;
+>undefinedUnion : { n: number; }
+>n : number
+
+var rest2: {};
+>rest2 : {}
+
+var {n, ...rest2 } = undefinedUnion;
+>n : number
+>rest2 : {}
+>undefinedUnion : { n: number; }
+
+
+var nullUnion: { n: number } | null;
+>nullUnion : { n: number; }
+>n : number
+>null : null
+
+var rest3: {};
+>rest3 : {}
+
+var {n, ...rest3 } = nullUnion;
+>n : number
+>rest3 : {}
+>nullUnion : { n: number; }
+
diff --git a/tests/baselines/reference/restUnion2.js b/tests/baselines/reference/restUnion2.js
new file mode 100644
index 00000000000..44a0acfbcf8
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.js
@@ -0,0 +1,38 @@
+//// [restUnion2.ts]
+
+declare const undefinedUnion: { n: number } | undefined;
+var rest2: { n: number };
+var {...rest2 } = undefinedUnion;
+
+
+declare const nullUnion: { n: number } | null;
+var rest3: { n: number };
+var {...rest3 } = nullUnion;
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+var rest4: { };
+var {...rest4 } = nullAndUndefinedUnion;
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+var rest5: { n: number, s: string };
+var {...rest5 } = unionWithIntersection;
+
+//// [restUnion2.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+var rest2;
+var rest2 = __rest(undefinedUnion, []);
+var rest3;
+var rest3 = __rest(nullUnion, []);
+var rest4;
+var rest4 = __rest(nullAndUndefinedUnion, []);
+var rest5;
+var rest5 = __rest(unionWithIntersection, []);
diff --git a/tests/baselines/reference/restUnion2.symbols b/tests/baselines/reference/restUnion2.symbols
new file mode 100644
index 00000000000..20a113a23b4
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.symbols
@@ -0,0 +1,52 @@
+=== tests/cases/compiler/restUnion2.ts ===
+
+declare const undefinedUnion: { n: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion2.ts, 1, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 1, 31))
+
+var rest2: { n: number };
+>rest2 : Symbol(rest2, Decl(restUnion2.ts, 2, 3), Decl(restUnion2.ts, 3, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 2, 12))
+
+var {...rest2 } = undefinedUnion;
+>rest2 : Symbol(rest2, Decl(restUnion2.ts, 2, 3), Decl(restUnion2.ts, 3, 5))
+>undefinedUnion : Symbol(undefinedUnion, Decl(restUnion2.ts, 1, 13))
+
+
+declare const nullUnion: { n: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(restUnion2.ts, 6, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 6, 26))
+
+var rest3: { n: number };
+>rest3 : Symbol(rest3, Decl(restUnion2.ts, 7, 3), Decl(restUnion2.ts, 8, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 7, 12))
+
+var {...rest3 } = nullUnion;
+>rest3 : Symbol(rest3, Decl(restUnion2.ts, 7, 3), Decl(restUnion2.ts, 8, 5))
+>nullUnion : Symbol(nullUnion, Decl(restUnion2.ts, 6, 13))
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 11, 13))
+
+var rest4: { };
+>rest4 : Symbol(rest4, Decl(restUnion2.ts, 12, 3), Decl(restUnion2.ts, 13, 5))
+
+var {...rest4 } = nullAndUndefinedUnion;
+>rest4 : Symbol(rest4, Decl(restUnion2.ts, 12, 3), Decl(restUnion2.ts, 13, 5))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(restUnion2.ts, 11, 13))
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+>unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 15, 13))
+>n : Symbol(n, Decl(restUnion2.ts, 15, 39))
+>s : Symbol(s, Decl(restUnion2.ts, 15, 55))
+
+var rest5: { n: number, s: string };
+>rest5 : Symbol(rest5, Decl(restUnion2.ts, 16, 3), Decl(restUnion2.ts, 17, 5))
+>n : Symbol(n, Decl(restUnion2.ts, 16, 12))
+>s : Symbol(s, Decl(restUnion2.ts, 16, 23))
+
+var {...rest5 } = unionWithIntersection;
+>rest5 : Symbol(rest5, Decl(restUnion2.ts, 16, 3), Decl(restUnion2.ts, 17, 5))
+>unionWithIntersection : Symbol(unionWithIntersection, Decl(restUnion2.ts, 15, 13))
+
diff --git a/tests/baselines/reference/restUnion2.types b/tests/baselines/reference/restUnion2.types
new file mode 100644
index 00000000000..81b768777fd
--- /dev/null
+++ b/tests/baselines/reference/restUnion2.types
@@ -0,0 +1,55 @@
+=== tests/cases/compiler/restUnion2.ts ===
+
+declare const undefinedUnion: { n: number } | undefined;
+>undefinedUnion : { n: number; } | undefined
+>n : number
+
+var rest2: { n: number };
+>rest2 : { n: number; }
+>n : number
+
+var {...rest2 } = undefinedUnion;
+>rest2 : { n: number; }
+>undefinedUnion : { n: number; } | undefined
+
+
+declare const nullUnion: { n: number } | null;
+>nullUnion : { n: number; } | null
+>n : number
+>null : null
+
+var rest3: { n: number };
+>rest3 : { n: number; }
+>n : number
+
+var {...rest3 } = nullUnion;
+>rest3 : { n: number; }
+>nullUnion : { n: number; } | null
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : null | undefined
+>null : null
+
+var rest4: { };
+>rest4 : {}
+
+var {...rest4 } = nullAndUndefinedUnion;
+>rest4 : {}
+>nullAndUndefinedUnion : null | undefined
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
+>n : number
+>s : string
+>null : null
+
+var rest5: { n: number, s: string };
+>rest5 : { n: number; s: string; }
+>n : number
+>s : string
+
+var {...rest5 } = unionWithIntersection;
+>rest5 : { n: number; s: string; }
+>unionWithIntersection : ({ n: number; } & { s: string; } & undefined) | null
+
diff --git a/tests/baselines/reference/spreadIntersection.js b/tests/baselines/reference/spreadIntersection.js
new file mode 100644
index 00000000000..b3fa9f0c2fb
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.js
@@ -0,0 +1,23 @@
+//// [spreadIntersection.ts]
+var intersection: { a: number } & { b: string };
+
+var o1: { a: number, b: string };
+var o1 = { ...intersection };
+
+var o2: { a: number, b: string, c: boolean };
+var o2 = { ...intersection, c: false };
+
+//// [spreadIntersection.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 intersection;
+var o1;
+var o1 = __assign({}, intersection);
+var o2;
+var o2 = __assign({}, intersection, { c: false });
diff --git a/tests/baselines/reference/spreadIntersection.symbols b/tests/baselines/reference/spreadIntersection.symbols
new file mode 100644
index 00000000000..1f6b3c12de1
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.symbols
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/spreadIntersection.ts ===
+var intersection: { a: number } & { b: string };
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 0, 19))
+>b : Symbol(b, Decl(spreadIntersection.ts, 0, 35))
+
+var o1: { a: number, b: string };
+>o1 : Symbol(o1, Decl(spreadIntersection.ts, 2, 3), Decl(spreadIntersection.ts, 3, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 2, 9))
+>b : Symbol(b, Decl(spreadIntersection.ts, 2, 20))
+
+var o1 = { ...intersection };
+>o1 : Symbol(o1, Decl(spreadIntersection.ts, 2, 3), Decl(spreadIntersection.ts, 3, 3))
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+
+var o2: { a: number, b: string, c: boolean };
+>o2 : Symbol(o2, Decl(spreadIntersection.ts, 5, 3), Decl(spreadIntersection.ts, 6, 3))
+>a : Symbol(a, Decl(spreadIntersection.ts, 5, 9))
+>b : Symbol(b, Decl(spreadIntersection.ts, 5, 20))
+>c : Symbol(c, Decl(spreadIntersection.ts, 5, 31))
+
+var o2 = { ...intersection, c: false };
+>o2 : Symbol(o2, Decl(spreadIntersection.ts, 5, 3), Decl(spreadIntersection.ts, 6, 3))
+>intersection : Symbol(intersection, Decl(spreadIntersection.ts, 0, 3))
+>c : Symbol(c, Decl(spreadIntersection.ts, 6, 27))
+
diff --git a/tests/baselines/reference/spreadIntersection.types b/tests/baselines/reference/spreadIntersection.types
new file mode 100644
index 00000000000..c3c6b99adee
--- /dev/null
+++ b/tests/baselines/reference/spreadIntersection.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/spreadIntersection.ts ===
+var intersection: { a: number } & { b: string };
+>intersection : { a: number; } & { b: string; }
+>a : number
+>b : string
+
+var o1: { a: number, b: string };
+>o1 : { a: number; b: string; }
+>a : number
+>b : string
+
+var o1 = { ...intersection };
+>o1 : { a: number; b: string; }
+>{ ...intersection } : { a: number; b: string; }
+>intersection : { a: number; } & { b: string; }
+
+var o2: { a: number, b: string, c: boolean };
+>o2 : { a: number; b: string; c: boolean; }
+>a : number
+>b : string
+>c : boolean
+
+var o2 = { ...intersection, c: false };
+>o2 : { a: number; b: string; c: boolean; }
+>{ ...intersection, c: false } : { c: boolean; a: number; b: string; }
+>intersection : { a: number; } & { b: string; }
+>c : boolean
+>false : false
+
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.errors.txt b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
new file mode 100644
index 00000000000..5088390f9ee
--- /dev/null
+++ b/tests/baselines/reference/spreadInvalidArgumentType.errors.txt
@@ -0,0 +1,104 @@
+tests/cases/compiler/spreadInvalidArgumentType.ts(31,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(33,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(35,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(36,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(38,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(41,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(42,16): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(44,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(45,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(47,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(48,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(55,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(56,17): error TS2698: Spread types may only be created from object types.
+tests/cases/compiler/spreadInvalidArgumentType.ts(58,17): error TS2698: Spread types may only be created from object types.
+
+
+==== tests/cases/compiler/spreadInvalidArgumentType.ts (14 errors) ====
+    enum E { v1, v2 };
+    
+    function f<T extends { b: string }>(p1: T, p2: T[]) {
+        var t: T;
+    
+        var i: T["b"];
+        var k: keyof T;
+    
+        var mapped_generic: {[P in keyof T]: T[P]};
+        var mapped: {[P in "b"]: T[P]};
+    
+        var union_generic: T | { a: number };
+        var union_primitive: { a: number } | number;
+    
+        var intersection_generic: T & { a: number };
+        var intersection_premitive: { a: number } | string;
+    
+        var num: number;
+        var str: number;
+    
+        var u: undefined;
+        var n: null;
+    
+        var a: any;
+    
+        var literal_string: "string";
+        var literal_number: 42;
+    
+        var e: E;
+    
+        var o1 = { ...p1 };   // Error, generic type paramterre
+                   ~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o2 = { ...p2 };   // OK
+        var o3 = { ...t };   // Error, generic type paramter
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o4 = { ...i };   // Error, index access
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o5 = { ...k };   // Error, index
+                   ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o6 = { ...mapped_generic }; // Error, generic mapped object type
+                   ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o7 = { ...mapped };  // OK, non-generic mapped type
+    
+        var o8 = { ...union_generic };  // Error, union with generic type parameter
+                   ~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o9 = { ...union_primitive };  // Error, union with generic type parameter
+                   ~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+                    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o12 = { ...num };  // Error
+                    ~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o13 = { ...str };  // Error
+                    ~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o14 = { ...u };  // OK
+        var o15 = { ...n };  // OK
+    
+        var o16 = { ...a };  // OK
+    
+        var o17 = { ...literal_string };  // Error
+                    ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+        var o18 = { ...literal_number };  // Error
+                    ~~~~~~~~~~~~~~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    
+        var o19 = { ...e };  // Error, enum
+                    ~~~~
+!!! error TS2698: Spread types may only be created from object types.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js
new file mode 100644
index 00000000000..26f958f224d
--- /dev/null
+++ b/tests/baselines/reference/spreadInvalidArgumentType.js
@@ -0,0 +1,114 @@
+//// [spreadInvalidArgumentType.ts]
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var o1 = { ...p1 };   // Error, generic type paramterre
+    var o2 = { ...p2 };   // OK
+    var o3 = { ...t };   // Error, generic type paramter
+
+    var o4 = { ...i };   // Error, index access
+    var o5 = { ...k };   // Error, index
+
+    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o7 = { ...mapped };  // OK, non-generic mapped type
+
+    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o9 = { ...union_primitive };  // Error, union with generic type parameter
+
+    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+
+    var o12 = { ...num };  // Error
+    var o13 = { ...str };  // Error
+
+    var o14 = { ...u };  // OK
+    var o15 = { ...n };  // OK
+
+    var o16 = { ...a };  // OK
+
+    var o17 = { ...literal_string };  // Error
+    var o18 = { ...literal_number };  // Error
+
+    var o19 = { ...e };  // Error, enum
+}
+
+//// [spreadInvalidArgumentType.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 E;
+(function (E) {
+    E[E["v1"] = 0] = "v1";
+    E[E["v2"] = 1] = "v2";
+})(E || (E = {}));
+;
+function f(p1, p2) {
+    var t;
+    var i;
+    var k;
+    var mapped_generic;
+    var mapped;
+    var union_generic;
+    var union_primitive;
+    var intersection_generic;
+    var intersection_premitive;
+    var num;
+    var str;
+    var u;
+    var n;
+    var a;
+    var literal_string;
+    var literal_number;
+    var e;
+    var o1 = __assign({}, p1); // Error, generic type paramterre
+    var o2 = __assign({}, p2); // OK
+    var o3 = __assign({}, t); // Error, generic type paramter
+    var o4 = __assign({}, i); // Error, index access
+    var o5 = __assign({}, k); // Error, index
+    var o6 = __assign({}, mapped_generic); // Error, generic mapped object type
+    var o7 = __assign({}, mapped); // OK, non-generic mapped type
+    var o8 = __assign({}, union_generic); // Error, union with generic type parameter
+    var o9 = __assign({}, union_primitive); // Error, union with generic type parameter
+    var o10 = __assign({}, intersection_generic); // Error, intersection with generic type parameter
+    var o11 = __assign({}, intersection_premitive); // Error, intersection with generic type parameter
+    var o12 = __assign({}, num); // Error
+    var o13 = __assign({}, str); // Error
+    var o14 = __assign({}, u); // OK
+    var o15 = __assign({}, n); // OK
+    var o16 = __assign({}, a); // OK
+    var o17 = __assign({}, literal_string); // Error
+    var o18 = __assign({}, literal_number); // Error
+    var o19 = __assign({}, e); // Error, enum
+}
diff --git a/tests/baselines/reference/spreadUnion.js b/tests/baselines/reference/spreadUnion.js
new file mode 100644
index 00000000000..2691a3acdcc
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.js
@@ -0,0 +1,28 @@
+//// [spreadUnion.ts]
+var union: { a: number } | { b: string };
+
+var o3: { a: number } | { b: string };
+var o3 =  { ...union };
+
+var o4: { a: boolean } | { b: string , a: boolean};
+var o4 =  { ...union, a: false };
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+var o5 =  { ...union, ...union };
+
+//// [spreadUnion.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 union;
+var o3;
+var o3 = __assign({}, union);
+var o4;
+var o4 = __assign({}, union, { a: false });
+var o5;
+var o5 = __assign({}, union, union);
diff --git a/tests/baselines/reference/spreadUnion.symbols b/tests/baselines/reference/spreadUnion.symbols
new file mode 100644
index 00000000000..40a63d56d49
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.symbols
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/spreadUnion.ts ===
+var union: { a: number } | { b: string };
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 0, 12))
+>b : Symbol(b, Decl(spreadUnion.ts, 0, 28))
+
+var o3: { a: number } | { b: string };
+>o3 : Symbol(o3, Decl(spreadUnion.ts, 2, 3), Decl(spreadUnion.ts, 3, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 2, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 2, 25))
+
+var o3 =  { ...union };
+>o3 : Symbol(o3, Decl(spreadUnion.ts, 2, 3), Decl(spreadUnion.ts, 3, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+
+var o4: { a: boolean } | { b: string , a: boolean};
+>o4 : Symbol(o4, Decl(spreadUnion.ts, 5, 3), Decl(spreadUnion.ts, 6, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 5, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 5, 26))
+>a : Symbol(a, Decl(spreadUnion.ts, 5, 38))
+
+var o4 =  { ...union, a: false };
+>o4 : Symbol(o4, Decl(spreadUnion.ts, 5, 3), Decl(spreadUnion.ts, 6, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 6, 21))
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+>o5 : Symbol(o5, Decl(spreadUnion.ts, 8, 3), Decl(spreadUnion.ts, 9, 3))
+>a : Symbol(a, Decl(spreadUnion.ts, 8, 9))
+>b : Symbol(b, Decl(spreadUnion.ts, 8, 25))
+>a : Symbol(a, Decl(spreadUnion.ts, 8, 41))
+>b : Symbol(b, Decl(spreadUnion.ts, 8, 52))
+
+var o5 =  { ...union, ...union };
+>o5 : Symbol(o5, Decl(spreadUnion.ts, 8, 3), Decl(spreadUnion.ts, 9, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+>union : Symbol(union, Decl(spreadUnion.ts, 0, 3))
+
diff --git a/tests/baselines/reference/spreadUnion.types b/tests/baselines/reference/spreadUnion.types
new file mode 100644
index 00000000000..9e5ac1cffd5
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion.types
@@ -0,0 +1,42 @@
+=== tests/cases/compiler/spreadUnion.ts ===
+var union: { a: number } | { b: string };
+>union : { a: number; } | { b: string; }
+>a : number
+>b : string
+
+var o3: { a: number } | { b: string };
+>o3 : { a: number; } | { b: string; }
+>a : number
+>b : string
+
+var o3 =  { ...union };
+>o3 : { a: number; } | { b: string; }
+>{ ...union } : { a: number; } | { b: string; }
+>union : { a: number; } | { b: string; }
+
+var o4: { a: boolean } | { b: string , a: boolean};
+>o4 : { a: boolean; } | { b: string; a: boolean; }
+>a : boolean
+>b : string
+>a : boolean
+
+var o4 =  { ...union, a: false };
+>o4 : { a: boolean; } | { b: string; a: boolean; }
+>{ ...union, a: false } : { a: boolean; } | { a: boolean; b: string; }
+>union : { a: number; } | { b: string; }
+>a : boolean
+>false : false
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+>o5 : { a: number; } | { b: string; } | { a: number; b: string; }
+>a : number
+>b : string
+>a : number
+>b : string
+
+var o5 =  { ...union, ...union };
+>o5 : { a: number; } | { b: string; } | { a: number; b: string; }
+>{ ...union, ...union } : { a: number; } | { b: string; a: number; } | { a: number; b: string; } | { b: string; }
+>union : { a: number; } | { b: string; }
+>union : { a: number; } | { b: string; }
+
diff --git a/tests/baselines/reference/spreadUnion2.js b/tests/baselines/reference/spreadUnion2.js
new file mode 100644
index 00000000000..6c7527af9dd
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.js
@@ -0,0 +1,49 @@
+//// [spreadUnion2.ts]
+
+declare const undefinedUnion: { a: number } | undefined;
+declare const nullUnion: { b: number } | null;
+declare const nullAndUndefinedUnion: null | undefined;
+
+var o1: { a: number };
+var o1 = { ...undefinedUnion };
+
+var o2: { b: number };
+var o2 = { ...nullUnion };
+
+var o3: { a: number, b: number };
+var o3 = { ...undefinedUnion, ...nullUnion };
+var o3 = { ...nullUnion, ...undefinedUnion };
+
+var o4: { a: number };
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+
+var o5: { b: number };
+var o5 = { ...nullUnion, ...nullUnion };
+
+var o6: { };
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+var o6 = { ...nullAndUndefinedUnion };
+
+//// [spreadUnion2.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 o1;
+var o1 = __assign({}, undefinedUnion);
+var o2;
+var o2 = __assign({}, nullUnion);
+var o3;
+var o3 = __assign({}, undefinedUnion, nullUnion);
+var o3 = __assign({}, nullUnion, undefinedUnion);
+var o4;
+var o4 = __assign({}, undefinedUnion, undefinedUnion);
+var o5;
+var o5 = __assign({}, nullUnion, nullUnion);
+var o6;
+var o6 = __assign({}, nullAndUndefinedUnion, nullAndUndefinedUnion);
+var o6 = __assign({}, nullAndUndefinedUnion);
diff --git a/tests/baselines/reference/spreadUnion2.symbols b/tests/baselines/reference/spreadUnion2.symbols
new file mode 100644
index 00000000000..cc2c194f2a6
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.symbols
@@ -0,0 +1,74 @@
+=== tests/cases/compiler/spreadUnion2.ts ===
+
+declare const undefinedUnion: { a: number } | undefined;
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>a : Symbol(a, Decl(spreadUnion2.ts, 1, 31))
+
+declare const nullUnion: { b: number } | null;
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>b : Symbol(b, Decl(spreadUnion2.ts, 2, 26))
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
+var o1: { a: number };
+>o1 : Symbol(o1, Decl(spreadUnion2.ts, 5, 3), Decl(spreadUnion2.ts, 6, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 5, 9))
+
+var o1 = { ...undefinedUnion };
+>o1 : Symbol(o1, Decl(spreadUnion2.ts, 5, 3), Decl(spreadUnion2.ts, 6, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o2: { b: number };
+>o2 : Symbol(o2, Decl(spreadUnion2.ts, 8, 3), Decl(spreadUnion2.ts, 9, 3))
+>b : Symbol(b, Decl(spreadUnion2.ts, 8, 9))
+
+var o2 = { ...nullUnion };
+>o2 : Symbol(o2, Decl(spreadUnion2.ts, 8, 3), Decl(spreadUnion2.ts, 9, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o3: { a: number, b: number };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 11, 9))
+>b : Symbol(b, Decl(spreadUnion2.ts, 11, 20))
+
+var o3 = { ...undefinedUnion, ...nullUnion };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o3 = { ...nullUnion, ...undefinedUnion };
+>o3 : Symbol(o3, Decl(spreadUnion2.ts, 11, 3), Decl(spreadUnion2.ts, 12, 3), Decl(spreadUnion2.ts, 13, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o4: { a: number };
+>o4 : Symbol(o4, Decl(spreadUnion2.ts, 15, 3), Decl(spreadUnion2.ts, 16, 3))
+>a : Symbol(a, Decl(spreadUnion2.ts, 15, 9))
+
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+>o4 : Symbol(o4, Decl(spreadUnion2.ts, 15, 3), Decl(spreadUnion2.ts, 16, 3))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+>undefinedUnion : Symbol(undefinedUnion, Decl(spreadUnion2.ts, 1, 13))
+
+var o5: { b: number };
+>o5 : Symbol(o5, Decl(spreadUnion2.ts, 18, 3), Decl(spreadUnion2.ts, 19, 3))
+>b : Symbol(b, Decl(spreadUnion2.ts, 18, 9))
+
+var o5 = { ...nullUnion, ...nullUnion };
+>o5 : Symbol(o5, Decl(spreadUnion2.ts, 18, 3), Decl(spreadUnion2.ts, 19, 3))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+>nullUnion : Symbol(nullUnion, Decl(spreadUnion2.ts, 2, 13))
+
+var o6: { };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
+var o6 = { ...nullAndUndefinedUnion };
+>o6 : Symbol(o6, Decl(spreadUnion2.ts, 21, 3), Decl(spreadUnion2.ts, 22, 3), Decl(spreadUnion2.ts, 23, 3))
+>nullAndUndefinedUnion : Symbol(nullAndUndefinedUnion, Decl(spreadUnion2.ts, 3, 13))
+
diff --git a/tests/baselines/reference/spreadUnion2.types b/tests/baselines/reference/spreadUnion2.types
new file mode 100644
index 00000000000..cf90381ca77
--- /dev/null
+++ b/tests/baselines/reference/spreadUnion2.types
@@ -0,0 +1,84 @@
+=== tests/cases/compiler/spreadUnion2.ts ===
+
+declare const undefinedUnion: { a: number } | undefined;
+>undefinedUnion : { a: number; } | undefined
+>a : number
+
+declare const nullUnion: { b: number } | null;
+>nullUnion : { b: number; } | null
+>b : number
+>null : null
+
+declare const nullAndUndefinedUnion: null | undefined;
+>nullAndUndefinedUnion : null | undefined
+>null : null
+
+var o1: { a: number };
+>o1 : { a: number; }
+>a : number
+
+var o1 = { ...undefinedUnion };
+>o1 : { a: number; }
+>{ ...undefinedUnion } : { a: number; }
+>undefinedUnion : { a: number; } | undefined
+
+var o2: { b: number };
+>o2 : { b: number; }
+>b : number
+
+var o2 = { ...nullUnion };
+>o2 : { b: number; }
+>{ ...nullUnion } : { b: number; }
+>nullUnion : { b: number; } | null
+
+var o3: { a: number, b: number };
+>o3 : { a: number; b: number; }
+>a : number
+>b : number
+
+var o3 = { ...undefinedUnion, ...nullUnion };
+>o3 : { a: number; b: number; }
+>{ ...undefinedUnion, ...nullUnion } : { b: number; a: number; }
+>undefinedUnion : { a: number; } | undefined
+>nullUnion : { b: number; } | null
+
+var o3 = { ...nullUnion, ...undefinedUnion };
+>o3 : { a: number; b: number; }
+>{ ...nullUnion, ...undefinedUnion } : { a: number; b: number; }
+>nullUnion : { b: number; } | null
+>undefinedUnion : { a: number; } | undefined
+
+var o4: { a: number };
+>o4 : { a: number; }
+>a : number
+
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+>o4 : { a: number; }
+>{ ...undefinedUnion, ...undefinedUnion } : { a: number; }
+>undefinedUnion : { a: number; } | undefined
+>undefinedUnion : { a: number; } | undefined
+
+var o5: { b: number };
+>o5 : { b: number; }
+>b : number
+
+var o5 = { ...nullUnion, ...nullUnion };
+>o5 : { b: number; }
+>{ ...nullUnion, ...nullUnion } : { b: number; }
+>nullUnion : { b: number; } | null
+>nullUnion : { b: number; } | null
+
+var o6: { };
+>o6 : {}
+
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+>o6 : {}
+>{ ...nullAndUndefinedUnion, ...nullAndUndefinedUnion } : {}
+>nullAndUndefinedUnion : null | undefined
+>nullAndUndefinedUnion : null | undefined
+
+var o6 = { ...nullAndUndefinedUnion };
+>o6 : {}
+>{ ...nullAndUndefinedUnion } : {}
+>nullAndUndefinedUnion : null | undefined
+
diff --git a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
index 0dff64c9a31..fafffb563ea 100644
--- a/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
+++ b/tests/baselines/reference/strictModeReservedWordInClassDeclaration.errors.txt
@@ -16,9 +16,9 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(21,9): error TS
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(21,17): error TS1213: Identifier expected. 'private' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(23,20): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
-tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS2693: 'public' only refers to a type, but is being used as a value here.
+tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(25,20): error TS2702: 'public' only refers to a type, but is being used as a namespace here.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
-tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS2693: 'public' only refers to a type, but is being used as a value here.
+tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(26,21): error TS2702: 'public' only refers to a type, but is being used as a namespace here.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(27,17): error TS2304: Cannot find name 'package'.
 tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
@@ -88,12 +88,12 @@ tests/cases/compiler/strictModeReservedWordInClassDeclaration.ts(28,17): error T
                        ~~~~~~
 !!! error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
                        ~~~~~~
-!!! error TS2693: 'public' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'public' only refers to a type, but is being used as a namespace here.
     class F1 implements public.private.implements { }
                         ~~~~~~
 !!! error TS1213: Identifier expected. 'public' is a reserved word in strict mode. Class definitions are automatically in strict mode.
                         ~~~~~~
-!!! error TS2693: 'public' only refers to a type, but is being used as a value here.
+!!! error TS2702: 'public' only refers to a type, but is being used as a namespace here.
     class G extends package { }
                     ~~~~~~~
 !!! error TS1213: Identifier expected. 'package' is a reserved word in strict mode. Class definitions are automatically in strict mode.
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.js b/tests/baselines/reference/unionTypeWithLeadingOperator.js
new file mode 100644
index 00000000000..0fb366d538e
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.js
@@ -0,0 +1,10 @@
+//// [unionTypeWithLeadingOperator.ts]
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];
+
+
+//// [unionTypeWithLeadingOperator.js]
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.symbols b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
new file mode 100644
index 00000000000..8c15d299c48
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.symbols
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : Symbol(A, Decl(unionTypeWithLeadingOperator.ts, 0, 0))
+
+type B =
+>B : Symbol(B, Decl(unionTypeWithLeadingOperator.ts, 0, 18))
+
+  | { type: "INCREMENT" }
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 2, 5))
+
+  | { type: "DECREMENT" };
+>type : Symbol(type, Decl(unionTypeWithLeadingOperator.ts, 3, 5))
+
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : Symbol(C, Decl(unionTypeWithLeadingOperator.ts, 3, 26))
+
diff --git a/tests/baselines/reference/unionTypeWithLeadingOperator.types b/tests/baselines/reference/unionTypeWithLeadingOperator.types
new file mode 100644
index 00000000000..2ca15fb54a2
--- /dev/null
+++ b/tests/baselines/reference/unionTypeWithLeadingOperator.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/unionTypeWithLeadingOperator.ts ===
+type A = | string;
+>A : string
+
+type B =
+>B : B
+
+  | { type: "INCREMENT" }
+>type : "INCREMENT"
+
+  | { type: "DECREMENT" };
+>type : "DECREMENT"
+
+type C = [| 0 | 1, | "foo" | "bar"];
+>C : [0 | 1, "foo" | "bar"]
+
diff --git a/tests/baselines/reference/useObjectValuesAndEntries1.types b/tests/baselines/reference/useObjectValuesAndEntries1.types
index f04201450c0..d9ccc019f75 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries1.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries1.types
@@ -22,38 +22,38 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);  // <-- entries: ['a' | 'b', number][]
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
 var entries1 = Object.entries(1); // <-- entries: [string, any][]
 >entries1 : [string, any][]
 >Object.entries(1) : [string, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >1 : 1
 
 var entries2 = Object.entries({a: true, b: 2}) // ['a' | 'b', number | boolean][]
->entries2 : ["a" | "b", number | boolean][]
->Object.entries({a: true, b: 2}) : ["a" | "b", number | boolean][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries2 : [string, number | boolean][]
+>Object.entries({a: true, b: 2}) : [string, number | boolean][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
->{a: true, b: 2} : { a: true; b: number; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
+>{a: true, b: 2} : { a: true; b: 2; }
 >a : boolean
 >true : true
 >b : number
 >2 : 2
 
 var entries3 = Object.entries({}) // [never, any][]
->entries3 : [never, any][]
->Object.entries({}) : [never, any][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries3 : [string, {}][]
+>Object.entries({}) : [string, {}][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >{} : {}
 
diff --git a/tests/baselines/reference/useObjectValuesAndEntries4.types b/tests/baselines/reference/useObjectValuesAndEntries4.types
index d68193993e2..05af55d42cb 100644
--- a/tests/baselines/reference/useObjectValuesAndEntries4.types
+++ b/tests/baselines/reference/useObjectValuesAndEntries4.types
@@ -22,10 +22,10 @@ for (var x of Object.values(o)) {
 }
 
 var entries = Object.entries(o);
->entries : ["a" | "b", number][]
->Object.entries(o) : ["a" | "b", number][]
->Object.entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : [string, number][]
+>Object.entries(o) : [string, number][]
+>Object.entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >Object : ObjectConstructor
->entries : { <T extends { [key: string]: any; }, K extends keyof T>(o: T): [keyof T, T[K]][]; (o: any): [string, any][]; }
+>entries : { <T>(o: { [s: string]: T; }): [string, T][]; (o: any): [string, any][]; }
 >o : { a: number; b: number; }
 
diff --git a/tests/baselines/reference/widenedTypes.errors.txt b/tests/baselines/reference/widenedTypes.errors.txt
index ea7c2b2f92a..5ea097acf2e 100644
--- a/tests/baselines/reference/widenedTypes.errors.txt
+++ b/tests/baselines/reference/widenedTypes.errors.txt
@@ -1,5 +1,4 @@
 tests/cases/compiler/widenedTypes.ts(2,1): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-tests/cases/compiler/widenedTypes.ts(5,1): error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
 tests/cases/compiler/widenedTypes.ts(6,7): error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
 tests/cases/compiler/widenedTypes.ts(8,15): error TS2407: The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter.
 tests/cases/compiler/widenedTypes.ts(10,14): error TS2695: Left side of comma operator is unused and has no side effects.
@@ -12,7 +11,7 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     Type 'number' is not assignable to type 'string'.
 
 
-==== tests/cases/compiler/widenedTypes.ts (9 errors) ====
+==== tests/cases/compiler/widenedTypes.ts (8 errors) ====
     
     null instanceof (() => { });
     ~~~~
@@ -20,8 +19,6 @@ tests/cases/compiler/widenedTypes.ts(24,5): error TS2322: Type '{ x: number; y:
     ({}) instanceof null; // Ok because null is a subtype of function
     
     null in {};
-    ~~~~
-!!! error TS2360: The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'.
     "" in null;
           ~~~~
 !!! error TS2361: The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter
diff --git a/tests/cases/compiler/commaOperatorInConditionalExpression.ts b/tests/cases/compiler/commaOperatorInConditionalExpression.ts
new file mode 100644
index 00000000000..a65d8ba1882
--- /dev/null
+++ b/tests/cases/compiler/commaOperatorInConditionalExpression.ts
@@ -0,0 +1,5 @@
+function f (m: string) {
+    [1, 2, 3].map(i => {
+        return true? { [m]: i } : { [m]: i + 1 }
+    })
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/controlFlowSelfReferentialLoop.ts b/tests/cases/compiler/controlFlowSelfReferentialLoop.ts
new file mode 100644
index 00000000000..361d3a557b4
--- /dev/null
+++ b/tests/cases/compiler/controlFlowSelfReferentialLoop.ts
@@ -0,0 +1,102 @@
+// @noimplicitany: true
+
+// Repro from #12319
+
+function md5(string:string): void {
+
+    function FF(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function GG(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function HH(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    function II(a,b,c,d,x,s,ac) {
+        return 0;
+    };
+
+    var x=Array();
+    var k,AA,BB,CC,DD,a,b,c,d;
+    var S11=7, S12=12, S13=17, S14=22;
+    var S21=5, S22=9 , S23=14, S24=20;
+    var S31=4, S32=11, S33=16, S34=23;
+    var S41=6, S42=10, S43=15, S44=21;
+
+    x = [1];
+
+    a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+
+    for (k=0;k<x.length;k+=16) {
+        AA=a; BB=b; CC=c; DD=d;
+        a=FF(a,b,c,d,x[k+0], S11,0xD76AA478);
+        d=FF(d,a,b,c,x[k+1], S12,0xE8C7B756);
+        c=FF(c,d,a,b,x[k+2], S13,0x242070DB);
+        b=FF(b,c,d,a,x[k+3], S14,0xC1BDCEEE);
+        a=FF(a,b,c,d,x[k+4], S11,0xF57C0FAF);
+        d=FF(d,a,b,c,x[k+5], S12,0x4787C62A);
+        c=FF(c,d,a,b,x[k+6], S13,0xA8304613);
+        b=FF(b,c,d,a,x[k+7], S14,0xFD469501);
+        a=FF(a,b,c,d,x[k+8], S11,0x698098D8);
+        d=FF(d,a,b,c,x[k+9], S12,0x8B44F7AF);
+        c=FF(c,d,a,b,x[k+10],S13,0xFFFF5BB1);
+        b=FF(b,c,d,a,x[k+11],S14,0x895CD7BE);
+        a=FF(a,b,c,d,x[k+12],S11,0x6B901122);
+        d=FF(d,a,b,c,x[k+13],S12,0xFD987193);
+        c=FF(c,d,a,b,x[k+14],S13,0xA679438E);
+        b=FF(b,c,d,a,x[k+15],S14,0x49B40821);
+        a=GG(a,b,c,d,x[k+1], S21,0xF61E2562);
+        d=GG(d,a,b,c,x[k+6], S22,0xC040B340);
+        c=GG(c,d,a,b,x[k+11],S23,0x265E5A51);
+        b=GG(b,c,d,a,x[k+0], S24,0xE9B6C7AA);
+        a=GG(a,b,c,d,x[k+5], S21,0xD62F105D);
+        d=GG(d,a,b,c,x[k+10],S22,0x2441453);
+        c=GG(c,d,a,b,x[k+15],S23,0xD8A1E681);
+        b=GG(b,c,d,a,x[k+4], S24,0xE7D3FBC8);
+        a=GG(a,b,c,d,x[k+9], S21,0x21E1CDE6);
+        d=GG(d,a,b,c,x[k+14],S22,0xC33707D6);
+        c=GG(c,d,a,b,x[k+3], S23,0xF4D50D87);
+        b=GG(b,c,d,a,x[k+8], S24,0x455A14ED);
+        a=GG(a,b,c,d,x[k+13],S21,0xA9E3E905);
+        d=GG(d,a,b,c,x[k+2], S22,0xFCEFA3F8);
+        c=GG(c,d,a,b,x[k+7], S23,0x676F02D9);
+        b=GG(b,c,d,a,x[k+12],S24,0x8D2A4C8A);
+        a=HH(a,b,c,d,x[k+5], S31,0xFFFA3942);
+        d=HH(d,a,b,c,x[k+8], S32,0x8771F681);
+        c=HH(c,d,a,b,x[k+11],S33,0x6D9D6122);
+        b=HH(b,c,d,a,x[k+14],S34,0xFDE5380C);
+        a=HH(a,b,c,d,x[k+1], S31,0xA4BEEA44);
+        d=HH(d,a,b,c,x[k+4], S32,0x4BDECFA9);
+        c=HH(c,d,a,b,x[k+7], S33,0xF6BB4B60);
+        b=HH(b,c,d,a,x[k+10],S34,0xBEBFBC70);
+        a=HH(a,b,c,d,x[k+13],S31,0x289B7EC6);
+        d=HH(d,a,b,c,x[k+0], S32,0xEAA127FA);
+        c=HH(c,d,a,b,x[k+3], S33,0xD4EF3085);
+        b=HH(b,c,d,a,x[k+6], S34,0x4881D05);
+        a=HH(a,b,c,d,x[k+9], S31,0xD9D4D039);
+        d=HH(d,a,b,c,x[k+12],S32,0xE6DB99E5);
+        c=HH(c,d,a,b,x[k+15],S33,0x1FA27CF8);
+        b=HH(b,c,d,a,x[k+2], S34,0xC4AC5665);
+        a=II(a,b,c,d,x[k+0], S41,0xF4292244);
+        d=II(d,a,b,c,x[k+7], S42,0x432AFF97);
+        c=II(c,d,a,b,x[k+14],S43,0xAB9423A7);
+        b=II(b,c,d,a,x[k+5], S44,0xFC93A039);
+        a=II(a,b,c,d,x[k+12],S41,0x655B59C3);
+        d=II(d,a,b,c,x[k+3], S42,0x8F0CCC92);
+        c=II(c,d,a,b,x[k+10],S43,0xFFEFF47D);
+        b=II(b,c,d,a,x[k+1], S44,0x85845DD1);
+        a=II(a,b,c,d,x[k+8], S41,0x6FA87E4F);
+        d=II(d,a,b,c,x[k+15],S42,0xFE2CE6E0);
+        c=II(c,d,a,b,x[k+6], S43,0xA3014314);
+        b=II(b,c,d,a,x[k+13],S44,0x4E0811A1);
+        a=II(a,b,c,d,x[k+4], S41,0xF7537E82);
+        d=II(d,a,b,c,x[k+11],S42,0xBD3AF235);
+        c=II(c,d,a,b,x[k+2], S43,0x2AD7D2BB);
+        b=II(b,c,d,a,x[k+9], S44,0xEB86D391);
+    }
+}
+export default md5;
\ No newline at end of file
diff --git a/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
new file mode 100644
index 00000000000..14183a5de59
--- /dev/null
+++ b/tests/cases/compiler/exhaustiveSwitchWithWideningLiteralTypes.ts
@@ -0,0 +1,18 @@
+// @strictNullChecks: true
+
+// Repro from #12529
+
+class A {
+    readonly kind = "A"; // (property) A.kind: "A"
+}
+
+class B {
+    readonly kind = "B"; // (property) B.kind: "B"
+}
+
+function f(value: A | B): number {
+    switch(value.kind) {
+        case "A": return 0;
+        case "B": return 1;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/intersectionTypeNormalization.ts b/tests/cases/compiler/intersectionTypeNormalization.ts
index f31c3d49014..3d07aeb1a23 100644
--- a/tests/cases/compiler/intersectionTypeNormalization.ts
+++ b/tests/cases/compiler/intersectionTypeNormalization.ts
@@ -57,4 +57,49 @@ function getValueAsString(value: IntersectionFail): string {
         return '' + value.num;
     }
     return value.str;
+}
+
+// Repro from #12535
+
+namespace enums {
+    export const enum A {
+        a1,
+        a2,
+        a3,
+       // ... elements omitted for the sake of clarity
+        a75,
+        a76,
+        a77,
+    }
+    export const enum B {
+        b1,
+        b2,
+       // ... elements omitted for the sake of clarity
+        b86,
+        b87,
+    }
+    export const enum C {
+        c1,
+        c2,
+       // ... elements omitted for the sake of clarity
+        c210,
+        c211,
+    }
+    export type Genre = A | B | C;
+}
+
+type Foo = {
+    genreId: enums.Genre;
+};
+
+type Bar = {
+    genreId: enums.Genre;
+};
+
+type FooBar = Foo & Bar;
+
+function foo(so: any) {
+    const val = so as FooBar;
+    const isGenre = val.genreId;
+    return isGenre;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..4138dee4261
--- /dev/null
+++ b/tests/cases/compiler/intersectionTypeWithLeadingOperator.ts
@@ -0,0 +1,6 @@
+type A = & string;
+type B =
+  & { foo: string }
+  & { bar: number };
+
+type C = [& { foo: 1 } & { bar: 2 }, & { foo: 3 } & { bar: 4 }];
diff --git a/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
new file mode 100644
index 00000000000..5391715cb3a
--- /dev/null
+++ b/tests/cases/compiler/invalidUseOfTypeAsNamespace.ts
@@ -0,0 +1,4 @@
+interface OhNo {
+}
+
+declare let y: OhNo.hello;
diff --git a/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
new file mode 100644
index 00000000000..86fd9935a1f
--- /dev/null
+++ b/tests/cases/compiler/jsxFactoryQualifiedNameWithEs5.ts
@@ -0,0 +1,17 @@
+//@module: commonjs
+//@target: es5
+//@jsx: react
+//@jsxFactory: skate.h
+//@noEmit: false
+
+// @filename: index.tsx
+import "./jsx";
+
+var skate: any;
+const React = { createElement: skate.h };
+
+class Component {
+    renderCallback() {
+        return <div>test</div>;
+    }
+};
\ No newline at end of file
diff --git a/tests/cases/compiler/keyofIsLiteralContexualType.ts b/tests/cases/compiler/keyofIsLiteralContexualType.ts
new file mode 100644
index 00000000000..dd14de92289
--- /dev/null
+++ b/tests/cases/compiler/keyofIsLiteralContexualType.ts
@@ -0,0 +1,13 @@
+// keyof T is a literal contextual type
+
+function foo<T extends { a: string, b: string }>() {
+    let a: (keyof T)[] = ["a", "b"];
+    let b: (keyof T)[] = ["a", "b", "c"];
+}
+
+// Repro from #12455
+
+declare function pick<T, K extends keyof T>(obj: T, propNames: K[]): Pick<T, K>;
+
+let x = pick({ a: 10, b: 20, c: 30 }, ["a", "c"]);
+let b = x.b;  // Error
\ No newline at end of file
diff --git a/tests/cases/compiler/mappedTypeInferenceCircularity.ts b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
new file mode 100644
index 00000000000..56fe08c5fe2
--- /dev/null
+++ b/tests/cases/compiler/mappedTypeInferenceCircularity.ts
@@ -0,0 +1,7 @@
+// Repro from #12511
+
+type HTML = { [K in 'div']: Block<HTML> };
+type Block<P> = <T>(func: HTML) => {};
+
+declare var h: HTML;
+h.div(h);
\ No newline at end of file
diff --git a/tests/cases/compiler/objectFreeze.ts b/tests/cases/compiler/objectFreeze.ts
new file mode 100644
index 00000000000..5e8539831b1
--- /dev/null
+++ b/tests/cases/compiler/objectFreeze.ts
@@ -0,0 +1,12 @@
+const f = Object.freeze(function foo(a: number, b: string) { return false; });
+f(1, "") === false;
+
+class C { constructor(a: number) { } }
+const c = Object.freeze(C);
+new c(1);
+
+const a = Object.freeze([1, 2, 3]);
+a[0] = a[2].toString();
+
+const o = Object.freeze({ a: 1, b: "string" });
+o.b = o.a.toString();
diff --git a/tests/cases/compiler/restIntersection.ts b/tests/cases/compiler/restIntersection.ts
new file mode 100644
index 00000000000..5fca2dafc36
--- /dev/null
+++ b/tests/cases/compiler/restIntersection.ts
@@ -0,0 +1,4 @@
+var intersection: { x: number, y: number } & { w: string, z: string };
+
+var rest1: { y: number, w: string, z: string };
+var {x, ...rest1 } = intersection;
diff --git a/tests/cases/compiler/restInvalidArgumentType.ts b/tests/cases/compiler/restInvalidArgumentType.ts
new file mode 100644
index 00000000000..488f546e231
--- /dev/null
+++ b/tests/cases/compiler/restInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var {...r1} = p1;   // Error, generic type paramterre
+    var {...r2} = p2;   // OK
+    var {...r3} = t;   // Error, generic type paramter
+
+    var {...r4} = i;   // Error, index access
+    var {...r5} = k;   // Error, index
+
+    var {...r6} = mapped_generic; // Error, generic mapped object type
+    var {...r7} = mapped;  // OK, non-generic mapped type
+
+    var {...r8} = union_generic;  // Error, union with generic type parameter
+    var {...r9} = union_primitive;  // Error, union with generic type parameter
+
+    var {...r10} = intersection_generic;  // Error, intersection with generic type parameter
+    var {...r11} = intersection_premitive;  // Error, intersection with generic type parameter
+
+    var {...r12} = num;  // Error
+    var {...r13} = str;  // Error
+
+    var {...r14} = u;  // OK
+    var {...r15} = n;  // OK
+
+    var {...r16} = a;  // OK
+
+    var {...r17} = literal_string;  // Error
+    var {...r18} = literal_number;  // Error
+
+    var {...r19} = e;  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/restUnion.ts b/tests/cases/compiler/restUnion.ts
new file mode 100644
index 00000000000..c838b37340f
--- /dev/null
+++ b/tests/cases/compiler/restUnion.ts
@@ -0,0 +1,14 @@
+var union: { a: number, c: boolean } | { a: string, b: string };
+
+var rest1: { c: boolean } | { b: string };
+var {a, ...rest1 } = union;
+
+
+var undefinedUnion: { n: number } | undefined;
+var rest2: {};
+var {n, ...rest2 } = undefinedUnion;
+
+
+var nullUnion: { n: number } | null;
+var rest3: {};
+var {n, ...rest3 } = nullUnion;
diff --git a/tests/cases/compiler/restUnion2.ts b/tests/cases/compiler/restUnion2.ts
new file mode 100644
index 00000000000..83d94e03a73
--- /dev/null
+++ b/tests/cases/compiler/restUnion2.ts
@@ -0,0 +1,19 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { n: number } | undefined;
+var rest2: { n: number };
+var {...rest2 } = undefinedUnion;
+
+
+declare const nullUnion: { n: number } | null;
+var rest3: { n: number };
+var {...rest3 } = nullUnion;
+
+
+declare const nullAndUndefinedUnion: null | undefined;
+var rest4: { };
+var {...rest4 } = nullAndUndefinedUnion;
+
+declare const unionWithIntersection: ({ n: number } & { s: string }) & undefined | null;
+var rest5: { n: number, s: string };
+var {...rest5 } = unionWithIntersection;
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadIntersection.ts b/tests/cases/compiler/spreadIntersection.ts
new file mode 100644
index 00000000000..3b397dc40cc
--- /dev/null
+++ b/tests/cases/compiler/spreadIntersection.ts
@@ -0,0 +1,7 @@
+var intersection: { a: number } & { b: string };
+
+var o1: { a: number, b: string };
+var o1 = { ...intersection };
+
+var o2: { a: number, b: string, c: boolean };
+var o2 = { ...intersection, c: false };
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadInvalidArgumentType.ts b/tests/cases/compiler/spreadInvalidArgumentType.ts
new file mode 100644
index 00000000000..2ac6aa921f4
--- /dev/null
+++ b/tests/cases/compiler/spreadInvalidArgumentType.ts
@@ -0,0 +1,59 @@
+enum E { v1, v2 };
+
+function f<T extends { b: string }>(p1: T, p2: T[]) {
+    var t: T;
+
+    var i: T["b"];
+    var k: keyof T;
+
+    var mapped_generic: {[P in keyof T]: T[P]};
+    var mapped: {[P in "b"]: T[P]};
+
+    var union_generic: T | { a: number };
+    var union_primitive: { a: number } | number;
+
+    var intersection_generic: T & { a: number };
+    var intersection_premitive: { a: number } | string;
+
+    var num: number;
+    var str: number;
+
+    var u: undefined;
+    var n: null;
+
+    var a: any;
+
+    var literal_string: "string";
+    var literal_number: 42;
+
+    var e: E;
+
+    var o1 = { ...p1 };   // Error, generic type paramterre
+    var o2 = { ...p2 };   // OK
+    var o3 = { ...t };   // Error, generic type paramter
+
+    var o4 = { ...i };   // Error, index access
+    var o5 = { ...k };   // Error, index
+
+    var o6 = { ...mapped_generic }; // Error, generic mapped object type
+    var o7 = { ...mapped };  // OK, non-generic mapped type
+
+    var o8 = { ...union_generic };  // Error, union with generic type parameter
+    var o9 = { ...union_primitive };  // Error, union with generic type parameter
+
+    var o10 = { ...intersection_generic };  // Error, intersection with generic type parameter
+    var o11 = { ...intersection_premitive };  // Error, intersection with generic type parameter
+
+    var o12 = { ...num };  // Error
+    var o13 = { ...str };  // Error
+
+    var o14 = { ...u };  // OK
+    var o15 = { ...n };  // OK
+
+    var o16 = { ...a };  // OK
+
+    var o17 = { ...literal_string };  // Error
+    var o18 = { ...literal_number };  // Error
+
+    var o19 = { ...e };  // Error, enum
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnion.ts b/tests/cases/compiler/spreadUnion.ts
new file mode 100644
index 00000000000..ef8440122ed
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion.ts
@@ -0,0 +1,10 @@
+var union: { a: number } | { b: string };
+
+var o3: { a: number } | { b: string };
+var o3 =  { ...union };
+
+var o4: { a: boolean } | { b: string , a: boolean};
+var o4 =  { ...union, a: false };
+
+var o5: { a: number } | { b: string } | { a: number, b: string };
+var o5 =  { ...union, ...union };
\ No newline at end of file
diff --git a/tests/cases/compiler/spreadUnion2.ts b/tests/cases/compiler/spreadUnion2.ts
new file mode 100644
index 00000000000..25dba81c0df
--- /dev/null
+++ b/tests/cases/compiler/spreadUnion2.ts
@@ -0,0 +1,25 @@
+// @strictNullChecks: true
+
+declare const undefinedUnion: { a: number } | undefined;
+declare const nullUnion: { b: number } | null;
+declare const nullAndUndefinedUnion: null | undefined;
+
+var o1: { a: number };
+var o1 = { ...undefinedUnion };
+
+var o2: { b: number };
+var o2 = { ...nullUnion };
+
+var o3: { a: number, b: number };
+var o3 = { ...undefinedUnion, ...nullUnion };
+var o3 = { ...nullUnion, ...undefinedUnion };
+
+var o4: { a: number };
+var o4 = { ...undefinedUnion, ...undefinedUnion };
+
+var o5: { b: number };
+var o5 = { ...nullUnion, ...nullUnion };
+
+var o6: { };
+var o6 = { ...nullAndUndefinedUnion, ...nullAndUndefinedUnion };
+var o6 = { ...nullAndUndefinedUnion };
\ No newline at end of file
diff --git a/tests/cases/compiler/unionTypeWithLeadingOperator.ts b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
new file mode 100644
index 00000000000..9f6d272ce7c
--- /dev/null
+++ b/tests/cases/compiler/unionTypeWithLeadingOperator.ts
@@ -0,0 +1,6 @@
+type A = | string;
+type B =
+  | { type: "INCREMENT" }
+  | { type: "DECREMENT" };
+
+type C = [| 0 | 1, | "foo" | "bar"];
diff --git a/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
new file mode 100644
index 00000000000..2c59b6f93cc
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractAccessor.ts
@@ -0,0 +1,8 @@
+// @target: es5
+
+abstract class A {
+   abstract get a();
+   abstract get aa() { return 1; } // error
+   abstract set b(x: string);
+   abstract set bb(x: string) {} // error
+}
diff --git a/tests/cases/conformance/types/keyof/keyofAndForIn.ts b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
new file mode 100644
index 00000000000..97b8587a243
--- /dev/null
+++ b/tests/cases/conformance/types/keyof/keyofAndForIn.ts
@@ -0,0 +1,36 @@
+// @declaration: true
+
+// Repro from #12513
+
+function f1<K extends string, T>(obj: { [P in K]: T }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f2<T>(obj: { [P in keyof T]: T[P] }, k: keyof T) {
+    const b = k in obj;
+    let k1: keyof T;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
+
+function f3<T, K extends keyof T>(obj: { [P in K]: T[P] }, k: K) {
+    const b = k in obj;
+    let k1: K;
+    for (k1 in obj) {
+        let x1 = obj[k1];
+    }
+    for (let k2 in obj) {
+        let x2 = obj[k2];
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
index 1e874aaf80f..9aa05798607 100644
--- a/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
+++ b/tests/cases/conformance/types/keyof/keyofAndIndexedAccess.ts
@@ -21,11 +21,12 @@ class Options {
 }
 
 type Dictionary<T> = { [x: string]: T };
+type NumericallyIndexed<T> = { [x: number]: T };
 
 const enum E { A, B, C }
 
-type K00 = keyof any;  // string | number
-type K01 = keyof string;  // number | "toString" | "charAt" | ...
+type K00 = keyof any;  // string
+type K01 = keyof string;  // "toString" | "charAt" | ...
 type K02 = keyof number;  // "toString" | "toFixed" | "toExponential" | ...
 type K03 = keyof boolean;  // "valueOf"
 type K04 = keyof void;  // never
@@ -34,19 +35,20 @@ type K06 = keyof null;  // never
 type K07 = keyof never;  // never
 
 type K10 = keyof Shape;  // "name" | "width" | "height" | "visible"
-type K11 = keyof Shape[];  // number | "length" | "toString" | ...
-type K12 = keyof Dictionary<Shape>;  // string | number
+type K11 = keyof Shape[];  // "length" | "toString" | ...
+type K12 = keyof Dictionary<Shape>;  // string
 type K13 = keyof {};  // never
 type K14 = keyof Object;  // "constructor" | "toString" | ...
 type K15 = keyof E;  // "toString" | "toFixed" | "toExponential" | ...
-type K16 = keyof [string, number];  // number | "0" | "1" | "length" | "toString" | ...
+type K16 = keyof [string, number];  // "0" | "1" | "length" | "toString" | ...
 type K17 = keyof (Shape | Item);  // "name"
 type K18 = keyof (Shape & Item);  // "name" | "width" | "height" | "visible" | "price"
+type K19 = keyof NumericallyIndexed<Shape> // never
 
 type KeyOf<T> = keyof T;
 
 type K20 = KeyOf<Shape>;  // "name" | "width" | "height" | "visible"
-type K21 = KeyOf<Dictionary<Shape>>;  // string | number
+type K21 = KeyOf<Dictionary<Shape>>;  // string
 
 type NAME = "name";
 type WIDTH_OR_HEIGHT = "width" | "height";
@@ -95,22 +97,18 @@ function f10(shape: Shape) {
 
 function f11(a: Shape[]) {
     let len = getProperty(a, "length");  // number
-    let shape = getProperty(a, 1000);    // Shape
-    setProperty(a, 1000, getProperty(a, 1001));
+    setProperty(a, "length", len);
 }
 
 function f12(t: [Shape, boolean]) {
     let len = getProperty(t, "length");
-    let s1 = getProperty(t, 0);    // Shape
     let s2 = getProperty(t, "0");  // Shape
-    let b1 = getProperty(t, 1);    // boolean
     let b2 = getProperty(t, "1");  // boolean
-    let x1 = getProperty(t, 2);    // Shape | boolean
 }
 
 function f13(foo: any, bar: any) {
     let x = getProperty(foo, "x");  // any
-    let y = getProperty(foo, 100);  // any
+    let y = getProperty(foo, "100");  // any
     let z = getProperty(foo, bar);  // any
 }
 
@@ -181,6 +179,46 @@ function f40(c: C) {
     let z: Z = c["z"];
 }
 
+function f50<T>(k: keyof T, s: string) {
+    const x1 = s as keyof T;
+    const x2 = k as string;
+}
+
+function f51<T, K extends keyof T>(k: K, s: string) {
+    const x1 = s as keyof T;
+    const x2 = k as string;
+}
+
+function f52<T>(obj: { [x: string]: boolean }, k: keyof T, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f53<T, K extends keyof T>(obj: { [x: string]: boolean }, k: K, s: string, n: number) {
+    const x1 = obj[s];
+    const x2 = obj[n];
+    const x3 = obj[k];
+}
+
+function f54<T>(obj: T, key: keyof T) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f55<T, K extends keyof T>(obj: T, key: K) {
+    for (let s in obj[key]) {
+    }
+    const b = "foo" in obj[key];
+}
+
+function f60<T>(source: T, target: T) {
+    for (let k in source) {
+        target[k] = source[k];
+    }
+}
+
 // Repros from #12011
 
 class Base {
@@ -211,4 +249,4 @@ class OtherPerson {
     getParts() {
         return getProperty(this, "parts")
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
new file mode 100644
index 00000000000..4aab2d95ba3
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/isomorphicMappedTypeInference.ts
@@ -0,0 +1,123 @@
+// @strictNullChecks: true
+// @noimplicitany: true
+// @declaration: true
+
+type Box<T> = {
+    value: T;
+}
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+}
+
+function box<T>(x: T): Box<T> {
+    return { value: x };
+}
+
+function unbox<T>(x: Box<T>): T {
+    return x.value;
+}
+
+function boxify<T>(obj: T): Boxified<T> {
+    let result = {} as Boxified<T>;
+    for (let k in obj) {
+        result[k] = box(obj[k]);
+    }
+    return result;
+}
+
+function unboxify<T>(obj: Boxified<T>): T {
+    let result = {} as T;
+    for (let k in obj) {
+        result[k] = unbox(obj[k]);
+    }
+    return result;
+}
+
+function assignBoxified<T>(obj: Boxified<T>, values: T) {
+    for (let k in values) {
+        obj[k].value = values[k];
+    }
+}
+
+function f1() {
+    let v = {
+        a: 42,
+        b: "hello",
+        c: true
+    };
+    let b = boxify(v);
+    let x: number = b.a.value;
+}
+
+function f2() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    let v = unboxify(b);
+    let x: number = v.a;
+}
+
+function f3() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    assignBoxified(b, { c: false });
+}
+
+function f4() {
+    let b = {
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    };
+    b = boxify(unboxify(b));
+    b = unboxify(boxify(b));
+}
+
+function makeRecord<T, K extends string>(obj: { [P in K]: T }) {
+    return obj;
+}
+
+function f5(s: string) {
+    let b = makeRecord({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v.a;
+}
+
+function makeDictionary<T>(obj: { [x: string]: T }) {
+    return obj;
+}
+
+function f6(s: string) {
+    let b = makeDictionary({
+        a: box(42),
+        b: box("hello"),
+        c: box(true)
+    });
+    let v = unboxify(b);
+    let x: string | number | boolean = v[s];
+}
+
+declare function validate<T>(obj: { [P in keyof T]?: T[P] }): T;
+declare function clone<T>(obj: { readonly [P in keyof T]: T[P] }): T;
+declare function validateAndClone<T>(obj: { readonly [P in keyof T]?: T[P] }): T;
+
+type Foo = {
+    a?: number;
+    readonly b: string;
+}
+
+function f10(foo: Foo) {
+    let x = validate(foo);  // { a: number, readonly b: string }
+    let y = clone(foo);  // { a?: number, b: string }
+    let z = validateAndClone(foo);  // { a: number, b: string }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
index c507bf64a6e..b318cde3aab 100644
--- a/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypeErrors.ts
@@ -20,8 +20,9 @@ interface Point {
 // Constraint checking
 
 type T00 = { [P in P]: string };  // Error
-type T01 = { [P in Date]: number };  // Error
-type T02 = Record<Date, number>;  // Error
+type T01 = { [P in number]: string };  // Error
+type T02 = { [P in Date]: number };  // Error
+type T03 = Record<Date, number>;  // Error
 
 type T10 = Pick<Shape, "name">;
 type T11 = Pick<Shape, "foo">;  // Error
diff --git a/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
new file mode 100644
index 00000000000..1e76c5b7452
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypeModifiers.ts
@@ -0,0 +1,85 @@
+// @strictNullChecks: true
+
+type T = { a: number, b: string };
+type TU = { a: number | undefined, b: string | undefined };
+type TP = { a?: number, b?: string };
+type TR = { readonly a: number, readonly b: string };
+type TPR = { readonly a?: number, readonly b?: string };
+
+// Validate they all have the same keys
+var v00: "a" | "b";
+var v00: keyof T;
+var v00: keyof TU;
+var v00: keyof TP;
+var v00: keyof TR;
+var v00: keyof TPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v01: T;
+var v01: Pick<TR, keyof T>;
+var v01: Pick<Readonly<T>, keyof T>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var v02: TU;
+var v02: Pick<TP, keyof T>;
+var v02: Pick<TPR, keyof T>;
+var v02: Pick<Partial<T>, keyof T>;
+var v02: Pick<Partial<Readonly<T>>, keyof T>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var v03: TP;
+var v03: Partial<T>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var v04: TR;
+var v04: Readonly<T>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var v05: TPR;
+var v05: Partial<TR>;
+var v05: Readonly<TP>;
+var v05: Partial<Readonly<T>>;
+var v05: Readonly<Partial<T>>;
+
+type Boxified<T> = { [P in keyof T]: { x: T[P] } };
+
+type B = { a: { x: number }, b: { x: string } };
+type BU = { a: { x: number } | undefined, b: { x: string } | undefined };
+type BP = { a?: { x: number }, b?: { x: string } };
+type BR = { readonly a: { x: number }, readonly b: { x: string } };
+type BPR = { readonly a?: { x: number }, readonly b?: { x: string } };
+
+// Validate they all have the same keys
+var b00: "a" | "b";
+var b00: keyof B;
+var b00: keyof BU;
+var b00: keyof BP;
+var b00: keyof BR;
+var b00: keyof BPR;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b01: B;
+var b01: Pick<BR, keyof B>;
+var b01: Pick<Readonly<BR>, keyof B>;
+
+// Validate that non-isomorphic mapped types strip modifiers
+var b02: BU;
+var b02: Pick<BP, keyof B>;
+var b02: Pick<BPR, keyof B>;
+var b02: Pick<Partial<B>, keyof B>;
+var b02: Pick<Partial<Readonly<B>>, keyof B>;
+
+// Validate that isomorphic mapped types preserve optional modifier
+var b03: BP;
+var b03: Partial<B>;
+
+// Validate that isomorphic mapped types preserve readonly modifier
+var b04: BR;
+var b04: Readonly<B>;
+
+// Validate that isomorphic mapped types preserve both partial and readonly modifiers
+var b05: BPR;
+var b05: Partial<BR>;
+var b05: Readonly<BP>;
+var b05: Partial<Readonly<B>>;
+var b05: Readonly<Partial<B>>;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes1.ts b/tests/cases/conformance/types/mapped/mappedTypes1.ts
index bfc68aaa59d..b74872c2bfd 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes1.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes1.ts
@@ -27,18 +27,16 @@ type T37 = { [P in keyof symbol]: void };
 type T38 = { [P in keyof never]: void };
 
 type T40 = { [P in string]: void };
-type T41 = { [P in number]: void };
-type T42 = { [P in string | number]: void };
-type T43 = { [P in "a" | "b" | 0 | 1]: void };
+type T43 = { [P in "a" | "b"]: void };
 type T44 = { [P in "a" | "b" | "0" | "1"]: void };
-type T45 = { [P in "a" | "b" | "0" | "1" | 0 | 1]: void };
-type T46 = { [P in number | "a" | "b" | 0 | 1]: void };
-type T47 = { [P in string | number | "a" | "b" | 0 | 1]: void };
+type T47 = { [P in string | "a" | "b" | "0" | "1"]: void };
 
 declare function f1<T1>(): { [P in keyof T1]: void };
 declare function f2<T1 extends string>(): { [P in keyof T1]: void };
 declare function f3<T1 extends number>(): { [P in keyof T1]: void };
+declare function f4<T1 extends Number>(): { [P in keyof T1]: void };
 
 let x1 = f1();
 let x2 = f2();
-let x3 = f3();
\ No newline at end of file
+let x3 = f3();
+let x4 = f4();
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes2.ts b/tests/cases/conformance/types/mapped/mappedTypes2.ts
index 7f5841410e4..60db4c1383b 100644
--- a/tests/cases/conformance/types/mapped/mappedTypes2.ts
+++ b/tests/cases/conformance/types/mapped/mappedTypes2.ts
@@ -28,28 +28,33 @@ type DeepReadonly<T> = {
 declare function assign<T>(obj: T, props: Partial<T>): void;
 declare function freeze<T>(obj: T): Readonly<T>;
 declare function pick<T, K extends keyof T>(obj: T, ...keys: K[]): Pick<T, K>;
-declare function mapObject<K extends string | number, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
+declare function mapObject<K extends string, T, U>(obj: Record<K, T>, f: (x: T) => U): Record<K, U>;
 declare function proxify<T>(obj: T): Proxify<T>;
 
+interface Point {
+    x: number;
+    y: number;
+}
+
 interface Shape {
     name: string;
     width: number;
     height: number;
-    visible: boolean;
+    location: Point;
 }
 
 interface PartialShape {
     name?: string;
     width?: number;
     height?: number;
-    visible?: boolean;
+    location?: Point;
 }
 
 interface ReadonlyShape {
     readonly name: string;
     readonly width: number;
     readonly height: number;
-    readonly visible: boolean;
+    readonly location: Point;
 }
 
 function f0(s1: Shape, s2: Shape) {
@@ -70,7 +75,7 @@ function f2(shape: Shape) {
 }
 
 function f3(shape: Shape) {
-    const x = pick(shape, "name", "visible");  // { name: string, visible: boolean }
+    const x = pick(shape, "name", "location");  // { name: string, location: Point }
 }
 
 function f4() {
@@ -81,11 +86,11 @@ function f4() {
 function f5(shape: Shape) {
     const p = proxify(shape);
     let name = p.name.get();
-    p.visible.set(false);
+    p.width.set(42);
 }
 
 function f6(shape: DeepReadonly<Shape>) {
-    let name = shape.name;  // DeepReadonly<string>
-    let length = name.length;  // DeepReadonly<number>
-    let toString = length.toString;  // DeepReadonly<(radix?: number) => string>
+    let name = shape.name;  // string
+    let location = shape.location;  // DeepReadonly<Point>
+    let x = location.x;  // number
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/mapped/mappedTypes4.ts b/tests/cases/conformance/types/mapped/mappedTypes4.ts
new file mode 100644
index 00000000000..74b3e395f32
--- /dev/null
+++ b/tests/cases/conformance/types/mapped/mappedTypes4.ts
@@ -0,0 +1,62 @@
+// @strictNullChecks: true
+// @declaration: true
+
+type Box<T> = {
+};
+
+type Boxified<T> = {
+    [P in keyof T]: Box<T[P]>;
+};
+
+function boxify<T>(obj: T): Boxified<T> {
+    if (typeof obj === "object") {
+        let result = {} as Boxified<T>;
+        for (let k in obj) {
+            result[k] = { value: obj[k] };
+        }
+        return result;
+    }
+    return <any>obj;
+}
+
+type A = { a: string };
+type B = { b: string };
+type C = { c: string };
+
+function f1(x: A | B | C | undefined) {
+    return boxify(x);
+}
+
+type T00 = Partial<A | B | C>;
+type T01 = Readonly<A | B | C | null | undefined>;
+type T02 = Boxified<A | B[] | C | string>
+type T03 = Readonly<string | number | boolean | null | undefined | void>;
+type T04 = Boxified<string | number | boolean | null | undefined | void>;
+type T05 = Partial<"hello" | "world" | 42>;
+
+type BoxifiedWithSentinel<T, U> = {
+    [P in keyof T]: Box<T[P]> | U;
+}
+
+type T10 = BoxifiedWithSentinel<A | B | C, null>;
+type T11 = BoxifiedWithSentinel<A | B | C, undefined>;
+type T12 = BoxifiedWithSentinel<string, undefined>;
+
+type DeepReadonly<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+type Foo = {
+    x: number;
+    y: { a: string, b: number };
+    z: boolean;
+};
+
+type DeepReadonlyFoo = {
+    readonly x: number;
+    readonly y: { readonly a: string, readonly b: number };
+    readonly z: boolean;
+};
+
+var x1: DeepReadonly<Foo>;
+var x1: DeepReadonlyFoo;
\ No newline at end of file
diff --git a/tests/cases/conformance/types/spread/objectSpreadNegative.ts b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
index 3cd819d0613..6d1e0dde429 100644
--- a/tests/cases/conformance/types/spread/objectSpreadNegative.ts
+++ b/tests/cases/conformance/types/spread/objectSpreadNegative.ts
@@ -29,9 +29,7 @@ spread = b; // error, missing 's'
 let duplicated = { b: 'bad', ...o, b: 'bad', ...o2, b: 'bad' }
 let duplicatedSpread = { ...o, ...o }
 
-// null, undefined and primitives are not allowed
-let spreadNull = { ...null };
-let spreadUndefind = { ...undefined };
+// primitives are not allowed
 let spreadNum = { ...12 };
 let spreadSum = { ...1 + 1 };
 spreadSum.toFixed(); // error, no methods from number
diff --git a/tests/cases/fourslash/formatWithTabs.ts b/tests/cases/fourslash/formatWithTabs.ts
new file mode 100644
index 00000000000..c33808bd26a
--- /dev/null
+++ b/tests/cases/fourslash/formatWithTabs.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+////const foo = [
+////		1
+////];
+
+const options = format.copyFormatOptions();
+options.IndentSize = 2;
+options.TabSize = 2;
+options.ConvertTabsToSpaces = false;
+format.setFormatOptions(options);
+format.document();
+verify.currentFileContentIs(
+`const foo = [
+	1
+];`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/formatWithTabs2.ts b/tests/cases/fourslash/formatWithTabs2.ts
new file mode 100644
index 00000000000..cda82b9cf80
--- /dev/null
+++ b/tests/cases/fourslash/formatWithTabs2.ts
@@ -0,0 +1,16 @@
+/// <reference path="fourslash.ts"/>
+
+////const foo = [
+//// 	1
+////];
+
+const options = format.copyFormatOptions();
+options.IndentSize = 2;
+options.TabSize = 2;
+options.ConvertTabsToSpaces = false;
+format.setFormatOptions(options);
+format.document();
+verify.currentFileContentIs(
+`const foo = [
+	1
+];`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/jsDocAugments.ts b/tests/cases/fourslash/jsDocAugments.ts
new file mode 100644
index 00000000000..24458c529fb
--- /dev/null
+++ b/tests/cases/fourslash/jsDocAugments.ts
@@ -0,0 +1,23 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+// @Filename: dummy.js
+
+//// /**
+////  * @augments {Thing<string>}
+////  */
+//// class MyStringThing extends Thing {
+////     constructor() {
+////         var x = this.mine;
+////         x/**/;
+////     }
+//// }
+
+// @Filename: declarations.d.ts
+//// declare class Thing<T> {
+////     mine: T;    
+//// }
+
+goTo.marker();
+verify.quickInfoIs("(local var) x: string");
+