diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 43cf8f622c68b..a557c72f10be7 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6623,8 +6623,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
                 if (
                     context.flags & NodeBuilderFlags.GenerateNamesForShadowedTypeParams &&
-                    type.flags & TypeFlags.TypeParameter &&
-                    !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)
+                    type.flags & TypeFlags.TypeParameter
                 ) {
                     const name = typeParameterToName(type, context);
                     context.approximateLength += idText(name).length;
@@ -7527,7 +7526,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 && signature.declaration
                 && signature.declaration !== context.enclosingDeclaration
                 && !isInJSFile(signature.declaration)
-                && some(expandedParams)
+                && (some(expandedParams) || some(signature.typeParameters))
             ) {
                 // As a performance optimization, reuse the same fake scope within this chain.
                 // This is especially needed when we are working on an excessively deep type;
@@ -7545,32 +7544,64 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 // Note that we only check the most immediate enclosingDeclaration; the only place we
                 // could potentially add another fake scope into the chain is right here, so we don't
                 // traverse all ancestors.
-                const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : undefined;
-                Debug.assertOptionalNode(existingFakeScope, isBlock);
+                pushFakeScope(
+                    "params",
+                    add => {
+                        for (const param of expandedParams) {
+                            add(param.escapedName, param);
+                        }
+                    },
+                );
 
-                const locals = existingFakeScope?.locals ?? createSymbolTable();
+                if (context.flags & NodeBuilderFlags.GenerateNamesForShadowedTypeParams) {
+                    // TODO(jakebailey): should this instead be done before walking type parameters?
+                    pushFakeScope(
+                        "typeParams",
+                        add => {
+                            for (const typeParam of signature.typeParameters ?? emptyArray) {
+                                const typeParamName = typeParameterToName(typeParam, context).escapedText;
+                                add(typeParamName, typeParam.symbol);
+                            }
+                        },
+                    );
+                }
 
-                let newLocals: __String[] | undefined;
-                for (const param of expandedParams) {
-                    if (!locals.has(param.escapedName)) {
-                        newLocals = append(newLocals, param.escapedName);
-                        locals.set(param.escapedName, param);
+                function pushFakeScope(kind: "params" | "typeParams", addAll: (addSymbol: (name: __String, symbol: Symbol) => void) => void) {
+                    // We only ever need to look two declarations upward.
+                    Debug.assert(context.enclosingDeclaration);
+                    let existingFakeScope: Node | undefined;
+                    if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind) {
+                        existingFakeScope = context.enclosingDeclaration;
                     }
-                }
+                    else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind) {
+                        existingFakeScope = context.enclosingDeclaration.parent;
+                    }
+                    Debug.assertOptionalNode(existingFakeScope, isBlock);
 
-                if (newLocals) {
-                    function removeNewLocals() {
+                    const locals = existingFakeScope?.locals ?? createSymbolTable();
+                    let newLocals: __String[] | undefined;
+                    addAll((name, symbol) => {
+                        if (!locals.has(name)) {
+                            newLocals = append(newLocals, name);
+                            locals.set(name, symbol);
+                        }
+                    });
+                    if (!newLocals) return;
+
+                    const oldCleanup = cleanup;
+                    function undo() {
                         forEach(newLocals, s => locals.delete(s));
+                        oldCleanup?.();
                     }
 
                     if (existingFakeScope) {
-                        cleanup = removeNewLocals;
+                        cleanup = undo;
                     }
                     else {
                         // Use a Block for this; the type of the node doesn't matter so long as it
                         // has locals, and this is cheaper/easier than using a function-ish Node.
                         const fakeScope = parseNodeFactory.createBlock(emptyArray);
-                        getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+                        getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind;
                         fakeScope.locals = locals;
 
                         const saveEnclosingDeclaration = context.enclosingDeclaration;
@@ -7579,7 +7610,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
                         cleanup = () => {
                             context.enclosingDeclaration = saveEnclosingDeclaration;
-                            removeNewLocals();
+                            undo();
                         };
                     }
                 }
@@ -8127,13 +8158,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             }
         }
 
-        function typeParameterShadowsNameInScope(escapedName: __String, context: NodeBuilderContext, type: TypeParameter) {
+        function typeParameterShadowsOtherTypeParameterInScope(escapedName: __String, context: NodeBuilderContext, type: TypeParameter) {
             const result = resolveName(context.enclosingDeclaration, escapedName, SymbolFlags.Type, /*nameNotFoundMessage*/ undefined, escapedName, /*isUse*/ false);
-            if (result) {
-                if (result.flags & SymbolFlags.TypeParameter && result === type.symbol) {
-                    return false;
-                }
-                return true;
+            if (result && result.flags & SymbolFlags.TypeParameter) {
+                return result !== type.symbol;
             }
             return false;
         }
@@ -8153,7 +8181,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 const rawtext = result.escapedText as string;
                 let i = context.typeParameterNamesByTextNextNameCount?.get(rawtext) || 0;
                 let text = rawtext;
-                while (context.typeParameterNamesByText?.has(text) || typeParameterShadowsNameInScope(text as __String, context, type)) {
+                while (context.typeParameterNamesByText?.has(text) || typeParameterShadowsOtherTypeParameterInScope(text as __String, context, type)) {
                     i++;
                     text = `${rawtext}_${i}`;
                 }
@@ -8166,7 +8194,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 // `i` we've used thus far, to save work later
                 (context.typeParameterNamesByTextNextNameCount ||= new Map()).set(rawtext, i);
                 (context.typeParameterNames ||= new Map()).set(getTypeId(type), result);
-                (context.typeParameterNamesByText ||= new Set()).add(rawtext);
+                (context.typeParameterNamesByText ||= new Set()).add(text);
             }
             return result;
         }
@@ -8345,7 +8373,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration: Node) {
-            return getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+            while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
+                enclosingDeclaration = enclosingDeclaration.parent;
+            }
+            return enclosingDeclaration;
         }
 
         /**
@@ -8425,7 +8456,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
                 if (isIdentifier(node)) {
                     const type = getDeclaredTypeOfSymbol(sym);
-                    const name = sym.flags & SymbolFlags.TypeParameter && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
+                    const name = sym.flags & SymbolFlags.TypeParameter ? typeParameterToName(type, context) : factory.cloneNode(node);
                     name.symbol = sym; // for quickinfo, which uses identifier symbol information
                     return { introducesError, node: setEmitFlags(setOriginalNode(name, node), EmitFlags.NoAsciiEscaping) };
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index b4dc259ea902f..1926ef4cd7795 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -6047,7 +6047,7 @@ export interface NodeLinks {
     decoratorSignature?: Signature;     // Signature for decorator as if invoked by the runtime.
     spreadIndices?: { first: number | undefined, last: number | undefined }; // Indices of first and last spread elements in array literal
     parameterInitializerContainsUndefined?: boolean; // True if this is a parameter declaration whose type annotation contains "undefined".
-    fakeScopeForSignatureDeclaration?: boolean; // True if this is a fake scope injected into an enclosing declaration chain.
+    fakeScopeForSignatureDeclaration?: "params" | "typeParams"; // If present, this is a fake scope injected into an enclosing declaration chain.
     assertionExpressionType?: Type;     // Cached type of the expression of a type assertion
 }
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures.types b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
index 645e052f4f485..7dd4861124743 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures.types
@@ -56,9 +56,9 @@ a = a2;
 >a2 : (x: number) => string
 
 t = <T>(x: T) => 1;
->t = <T>(x: T) => 1 : <T_1>(x: T_1) => number
+>t = <T>(x: T) => 1 : <T>(x: T) => number
 >t : T
-><T>(x: T) => 1 : <T_1>(x: T_1) => number
+><T>(x: T) => 1 : <T>(x: T) => number
 >x : T
 >1 : 1
 
@@ -76,9 +76,9 @@ t = function (x: number) { return ''; }
 >'' : ""
 
 a = <T>(x: T) => 1;
->a = <T>(x: T) => 1 : <T_1>(x: T_1) => number
+>a = <T>(x: T) => 1 : <T>(x: T) => number
 >a : (x: number) => void
-><T>(x: T) => 1 : <T_1>(x: T_1) => number
+><T>(x: T) => 1 : <T>(x: T) => number
 >x : T
 >1 : 1
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
index 3d2c5fe0f4c1d..345e81daaa362 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures2.types
@@ -68,11 +68,11 @@ t = { f: () => 1 };
 >1 : 1
 
 t = { f: <T>(x:T) => 1 };
->t = { f: <T>(x:T) => 1 } : { f: <T_1>(x: T_1) => number; }
+>t = { f: <T>(x:T) => 1 } : { f: <T>(x: T) => number; }
 >t : T
->{ f: <T>(x:T) => 1 } : { f: <T_1>(x: T_1) => number; }
->f : <T_1>(x: T_1) => number
-><T>(x:T) => 1 : <T_1>(x: T_1) => number
+>{ f: <T>(x:T) => 1 } : { f: <T>(x: T) => number; }
+>f : <T>(x: T) => number
+><T>(x:T) => 1 : <T>(x: T) => number
 >x : T
 >1 : 1
 
@@ -102,11 +102,11 @@ a = { f: () => 1 }
 >1 : 1
 
 a = { f: <T>(x: T) => 1 };
->a = { f: <T>(x: T) => 1 } : { f: <T_1>(x: T_1) => number; }
+>a = { f: <T>(x: T) => 1 } : { f: <T>(x: T) => number; }
 >a : { f(x: number): void; }
->{ f: <T>(x: T) => 1 } : { f: <T_1>(x: T_1) => number; }
->f : <T_1>(x: T_1) => number
-><T>(x: T) => 1 : <T_1>(x: T_1) => number
+>{ f: <T>(x: T) => 1 } : { f: <T>(x: T) => number; }
+>f : <T>(x: T) => number
+><T>(x: T) => 1 : <T>(x: T) => number
 >x : T
 >1 : 1
 
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 4c11234186aff..c73ecb914c3bf 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -355,7 +355,7 @@ b13 = a13; // ok
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 
 var b14: <T>(x: { a: T; b: T }) => T; 
->b14 : <T>(x: { a: T; b: T; }) => T
+>b14 : <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
index 7dd453a01a97b..8cb1642ff718e 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures4.types
@@ -224,7 +224,7 @@ module Errors {
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 
         var b15: <T>(x: { a: T; b: T }) => T; 
->b15 : <T>(x: { a: T; b: T; }) => T
+>b15 : <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -240,7 +240,7 @@ module Errors {
 >a15 : (x: { a: string; b: number; }) => number
 
         var b15a: <T extends Base>(x: { a: T; b: T }) => number; 
->b15a : <T extends Base>(x: { a: T; b: T; }) => number
+>b15a : <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
index 3ec7b4b221f7a..09484fb912718 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures5.types
@@ -50,7 +50,7 @@ var a6: <T extends Base>(x: (arg: T) => Derived) => T;
 >arg : T
 
 var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -58,13 +58,13 @@ var a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >bar : T
 
 var a15: <T>(x: { a: T; b: T }) => T[];
->a15 : <T>(x: { a: T; b: T; }) => T[]
+>a15 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
 var a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -194,7 +194,7 @@ b6 = a6; // ok
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
 
 var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>b11 : <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -212,7 +212,7 @@ b11 = a11; // ok
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 
 var b15: <U, V>(x: { a: U; b: V; }) => U[]; 
->b15 : <U, V>(x: { a: U; b: V; }) => U[]
+>b15 : <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
@@ -228,7 +228,7 @@ b15 = a15; // ok
 >a15 : <T>(x: { a: T; b: T; }) => T[]
 
 var b16: <T>(x: { a: T; b: T }) => T[]; 
->b16 : <T>(x: { a: T; b: T; }) => T[]
+>b16 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
index 23f7daaf22374..bf438aba65cd1 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures6.types
@@ -51,7 +51,7 @@ interface A {
 >arg : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -59,13 +59,13 @@ interface A {
 >bar : T
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : <T>(x: { a: T; b: T; }) => T[]
+>a15 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -167,7 +167,7 @@ b5 = x.a5;
 >a5 : <T, U>(x: (arg: T) => U) => T
 
 var b11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>b11 : <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -189,7 +189,7 @@ b11 = x.a11;
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 
 var b16: <T>(x: { a: T; b: T }) => T[]; 
->b16 : <T>(x: { a: T; b: T; }) => T[]
+>b16 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index beeb022033c73..8bf8a3a79f3d8 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -355,7 +355,7 @@ b13 = a13; // ok
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 
 var b14: new <T>(x: { a: T; b: T }) => T; 
->b14 : new <T>(x: { a: T; b: T; }) => T
+>b14 : new <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
index f6302f5cd1a36..e854003d55ecc 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures4.types
@@ -224,7 +224,7 @@ module Errors {
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 
         var b15: new <T>(x: { a: T; b: T }) => T; 
->b15 : new <T>(x: { a: T; b: T; }) => T
+>b15 : new <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -240,7 +240,7 @@ module Errors {
 >a15 : new (x: { a: string; b: number; }) => number
 
         var b15a: new <T extends Base>(x: { a: T; b: T }) => number; 
->b15a : new <T extends Base>(x: { a: T; b: T; }) => number
+>b15a : new <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
index 6e208fadc12a1..bdc3a654cf402 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures5.types
@@ -50,7 +50,7 @@ var a6: new <T extends Base>(x: new (arg: T) => Derived) => T;
 >arg : T
 
 var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -58,13 +58,13 @@ var a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 >bar : T
 
 var a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
 var a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -194,7 +194,7 @@ b6 = a6; // ok
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
 
 var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>b11 : new <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -212,7 +212,7 @@ b11 = a11; // ok
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 
 var b15: new <U, V>(x: { a: U; b: V; }) => U[]; 
->b15 : new <U, V>(x: { a: U; b: V; }) => U[]
+>b15 : new <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
@@ -228,7 +228,7 @@ b15 = a15; // ok
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
 
 var b16: new <T>(x: { a: T; b: T }) => T[]; 
->b16 : new <T>(x: { a: T; b: T; }) => T[]
+>b16 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
index 5c1b806659a56..34d3518a3b1d3 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures6.types
@@ -51,7 +51,7 @@ interface A {
 >arg : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -59,13 +59,13 @@ interface A {
 >bar : T
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -167,7 +167,7 @@ b5 = x.a5;
 >a5 : new <T, U>(x: (arg: T) => U) => T
 
 var b11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->b11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>b11 : new <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -189,7 +189,7 @@ b11 = x.a11;
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 
 var b16: new <T>(x: { a: T; b: T }) => T[]; 
->b16 : new <T>(x: { a: T; b: T; }) => T[]
+>b16 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
index 55c886c9f7d1b..cde481af55d4a 100644
--- a/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
+++ b/tests/baselines/reference/asyncFunctionsAndStrictNullChecks.types
@@ -13,7 +13,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => IPromise<U_3>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; <U_4>(success?: ((value: TResult) => U_4) | undefined, error?: ((error: any) => U_4) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_4>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U>(success?: ((value: TResult) => IPromise<U>) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_2>(success?: ((value: TResult) => U_2) | undefined, error?: ((error: any) => IPromise<U_2>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
 >success : ((value: TResult) => IPromise<U>) | undefined
 >value : TResult
 >error : ((error: any) => U) | undefined
@@ -22,7 +22,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_4>(success?: ((value: TResult) => U_4) | undefined, error?: ((error: any) => U_4) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_4>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => IPromise<U>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => U_3) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; }
 >success : ((value: TResult) => U) | undefined
 >value : TResult
 >error : ((error: any) => IPromise<U>) | undefined
@@ -31,7 +31,7 @@ declare namespace Windows.Foundation {
 >progress : any
 
         then<U>(success?: (value: TResult) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => IPromise<U_3>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; <U_4>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
+>then : { <U_1>(success?: ((value: TResult) => IPromise<U_1>) | undefined, error?: ((error: any) => IPromise<U_1>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_1>; <U_2>(success?: ((value: TResult) => IPromise<U_2>) | undefined, error?: ((error: any) => U_2) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_2>; <U_3>(success?: ((value: TResult) => U_3) | undefined, error?: ((error: any) => IPromise<U_3>) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U_3>; <U>(success?: ((value: TResult) => U) | undefined, error?: ((error: any) => U) | undefined, progress?: ((progress: any) => void) | undefined): IPromise<U>; }
 >success : ((value: TResult) => U) | undefined
 >value : TResult
 >error : ((error: any) => U) | undefined
diff --git a/tests/baselines/reference/awaitedTypeJQuery.types b/tests/baselines/reference/awaitedTypeJQuery.types
index 8140863465296..89975b6d642db 100644
--- a/tests/baselines/reference/awaitedTypeJQuery.types
+++ b/tests/baselines/reference/awaitedTypeJQuery.types
@@ -58,7 +58,7 @@ interface PromiseBase<TR, TJ, TN,
         CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP,
         RRD | RRF | RRP, RJD | RJF | RJP, RND | RNF | RNP>;
     then<ARF = never, AJF = never, ANF = never,
->then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARD | ARF_1 | ARP_1, AJD | AJF_1 | AJP_1, AND | ANF_1 | ANP_1, BRD | BRF_1 | BRP_1, BJD | BJF_1 | BJP_1, BND | BNF_1 | BNP_1, CRD | CRF_1 | CRP_1, CJD | CJF_1 | CJP_1, CND | CNF_1 | CNP_1, RRD | RRF_1 | RRP_1, RJD | RJF_1 | RJP_1, RND | RNF_1 | RNP_1>; <ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never, ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP, BRF | BRP, BJF | BJP, BNF | BNP, CRF | CRP, CJF | CJP, CNF | CNP, RRF | RRP, RJF | RJP, RNF | RNP>; <ARP_3 = never, AJP_3 = never, ANP_3 = never, BRP_3 = never, BJP_3 = never, BNP_3 = never, CRP_3 = never, CJP_3 = never, CNP_3 = never, RRP_3 = never, RJP_3 = never, RNP_3 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_3 | PromiseBase<ARP_3, AJP_3, ANP_3, BRP_3, BJP_3, BNP_3, CRP_3, CJP_3, CNP_3, RRP_3, RJP_3, RNP_3> | Thenable<ANP_3>): PromiseBase<ARP_3, AJP_3, ANP_3, BRP_3, BJP_3, BNP_3, CRP_3, CJP_3, CNP_3, RRP_3, RJP_3, RNP_3>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARD_1 | ARF_3, AJD_1 | AJF_3, AND_1 | ANF_3, BRD_1 | BRF_3, BJD_1 | BJF_3, BND_1 | BNF_3, CRD_1 | CRF_3, CJD_1 | CJF_3, CND_1 | CNF_3, RRD_1 | RRF_3, RJD_1 | RJF_3, RND_1 | RNF_3>; <ARF_4 = never, AJF_4 = never, ANF_4 = never, BRF_4 = never, BJF_4 = never, BNF_4 = never, CRF_4 = never, CJF_4 = never, CNF_4 = never, RRF_4 = never, RJF_4 = never, RNF_4 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_4 | PromiseBase<ARF_4, AJF_4, ANF_4, BRF_4, BJF_4, BNF_4, CRF_4, CJF_4, CNF_4, RRF_4, RJF_4, RNF_4> | Thenable<ARF_4>, progressFilter?: null): PromiseBase<ARF_4, AJF_4, ANF_4, BRF_4, BJF_4, BNF_4, CRF_4, CJF_4, CNF_4, RRF_4, RJF_4, RNF_4>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
+>then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARD | ARF_1 | ARP_1, AJD | AJF_1 | AJP_1, AND | ANF_1 | ANP_1, BRD | BRF_1 | BRP_1, BJD | BJF_1 | BJP_1, BND | BNF_1 | BNP_1, CRD | CRF_1 | CRP_1, CJD | CJF_1 | CJP_1, CND | CNF_1 | CNP_1, RRD | RRF_1 | RRP_1, RJD | RJF_1 | RJP_1, RND | RNF_1 | RNP_1>; <ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP, BRF | BRP, BJF | BJP, BNF | BNP, CRF | CRP, CJF | CJP, CNF | CNP, RRF | RRP, RJF | RJP, RNF | RNP>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter?: null): PromiseBase<ARD_1 | ARF_2, AJD_1 | AJF_2, AND_1 | ANF_2, BRD_1 | BRF_2, BJD_1 | BJF_2, BND_1 | BNF_2, CRD_1 | CRF_2, CJD_1 | CJF_2, CND_1 | CNF_2, RRD_1 | RRF_2, RJD_1 | RJF_2, RND_1 | RNF_2>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
 
         BRF = never, BJF = never, BNF = never,
         CRF = never, CJF = never, CNF = never,
@@ -94,7 +94,7 @@ interface PromiseBase<TR, TJ, TN,
         CRF | CRP, CJF | CJP, CNF | CNP,
         RRF | RRP, RJF | RJP, RNF | RNP>;
     then<ARP = never, AJP = never, ANP = never,
->then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF | PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARD | ARF | ARP_1, AJD | AJF | AJP_1, AND | ANF | ANP_1, BRD | BRF | BRP_1, BJD | BJF | BJP_1, BND | BNF | BNP_1, CRD | CRF | CRP_1, CJD | CJF | CJP_1, CND | CNF | CNP_1, RRD | RRF | RRP_1, RJD | RJF | RJP_1, RND | RNF | RNP_1>; <ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARF_1 | ARP_2, AJF_1 | AJP_2, ANF_1 | ANP_2, BRF_1 | BRP_2, BJF_1 | BJP_2, BNF_1 | BNP_2, CRF_1 | CRP_2, CJF_1 | CJP_2, CNF_1 | CNP_2, RRF_1 | RRP_2, RJF_1 | RJP_2, RNF_1 | RNP_2>; <ARP_3 = never, AJP_3 = never, ANP_3 = never, BRP_3 = never, BJP_3 = never, BNP_3 = never, CRP_3 = never, CJP_3 = never, CNP_3 = never, RRP_3 = never, RJP_3 = never, RNP_3 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter?: null): PromiseBase<ARD_1 | ARF_2, AJD_1 | AJF_2, AND_1 | ANF_2, BRD_1 | BRF_2, BJD_1 | BJF_2, BND_1 | BNF_2, CRD_1 | CRF_2, CJD_1 | CJF_2, CND_1 | CNF_2, RRD_1 | RRF_2, RJD_1 | RJF_2, RND_1 | RNF_2>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
+>then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF | PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARD | ARF | ARP_1, AJD | AJF | AJP_1, AND | ANF | ANP_1, BRD | BRF | BRP_1, BJD | BJF | BJP_1, BND | BNF | BNP_1, CRD | CRF | CRP_1, CJD | CJF | CJP_1, CND | CNF | CNP_1, RRD | RRF | RRP_1, RJD | RJF | RJP_1, RND | RNF | RNP_1>; <ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARF_1 | ARP_2, AJF_1 | AJP_2, ANF_1 | ANP_2, BRF_1 | BRP_2, BJF_1 | BJP_2, BNF_1 | BNP_2, CRF_1 | CRP_2, CJF_1 | CJP_2, CNF_1 | CNP_2, RRF_1 | RRP_2, RJF_1 | RJP_2, RNF_1 | RNP_2>; <ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter?: null): PromiseBase<ARD_1 | ARF_2, AJD_1 | AJF_2, AND_1 | ANF_2, BRD_1 | BRF_2, BJD_1 | BJF_2, BND_1 | BNF_2, CRD_1 | CRF_2, CJD_1 | CJF_2, CND_1 | CNF_2, RRD_1 | RRF_2, RJD_1 | RJF_2, RND_1 | RNF_2>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
 
         BRP = never, BJP = never, BNP = never,
         CRP = never, CJP = never, CNP = never,
@@ -119,7 +119,7 @@ interface PromiseBase<TR, TJ, TN,
         CRP, CJP, CNP,
         RRP, RJP, RNP>;
     then<ARD = never, AJD = never, AND = never,
->then : { <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD_1 | ARF_1 | ARP, AJD_1 | AJF_1 | AJP, AND_1 | ANF_1 | ANP, BRD_1 | BRF_1 | BRP, BJD_1 | BJF_1 | BJP, BND_1 | BNF_1 | BNP, CRD_1 | CRF_1 | CRP, CJD_1 | CJF_1 | CJP, CND_1 | CNF_1 | CNP, RRD_1 | RRF_1 | RRP, RJD_1 | RJF_1 | RJP, RND_1 | RNF_1 | RNP>; <ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_2 | ARP_1, AJF_2 | AJP_1, ANF_2 | ANP_1, BRF_2 | BRP_1, BJF_2 | BJP_1, BNF_2 | BNP_1, CRF_2 | CRP_1, CJF_2 | CJP_1, CNF_2 | CNP_1, RRF_2 | RRP_1, RJF_2 | RJP_1, RNF_2 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never, ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD> | ARD, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF, BRD | BRF, BJD | BJF, BND | BNF, CRD | CRF, CJD | CJF, CND | CNF, RRD | RRF, RJD | RJF, RND | RNF>; <ARF_4 = never, AJF_4 = never, ANF_4 = never, BRF_4 = never, BJF_4 = never, BNF_4 = never, CRF_4 = never, CJF_4 = never, CNF_4 = never, RRF_4 = never, RJF_4 = never, RNF_4 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_4 | PromiseBase<ARF_4, AJF_4, ANF_4, BRF_4, BJF_4, BNF_4, CRF_4, CJF_4, CNF_4, RRF_4, RJF_4, RNF_4> | Thenable<ARF_4>, progressFilter?: null): PromiseBase<ARF_4, AJF_4, ANF_4, BRF_4, BJF_4, BNF_4, CRF_4, CJF_4, CNF_4, RRF_4, RJF_4, RNF_4>; <ARD_3 = never, AJD_3 = never, AND_3 = never, BRD_3 = never, BJD_3 = never, BND_3 = never, CRD_3 = never, CJD_3 = never, CND_3 = never, RRD_3 = never, RJD_3 = never, RND_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_3 | PromiseBase<ARD_3, AJD_3, AND_3, BRD_3, BJD_3, BND_3, CRD_3, CJD_3, CND_3, RRD_3, RJD_3, RND_3> | Thenable<ARD_3>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_3, AJD_3, AND_3, BRD_3, BJD_3, BND_3, CRD_3, CJD_3, CND_3, RRD_3, RJD_3, RND_3>; }
+>then : { <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD_1 | ARF_1 | ARP, AJD_1 | AJF_1 | AJP, AND_1 | ANF_1 | ANP, BRD_1 | BRF_1 | BRP, BJD_1 | BJF_1 | BJP, BND_1 | BNF_1 | BNP, CRD_1 | CRF_1 | CRP, CJD_1 | CJF_1 | CJP, CND_1 | CNF_1 | CNP, RRD_1 | RRF_1 | RRP, RJD_1 | RJF_1 | RJP, RND_1 | RNF_1 | RNP>; <ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_2 | ARP_1, AJF_2 | AJP_1, ANF_2 | ANP_1, BRF_2 | BRP_1, BJF_2 | BJP_1, BNF_2 | BNP_1, CRF_2 | CRP_1, CJF_2 | CJP_1, CNF_2 | CNP_1, RRF_2 | RRP_1, RJF_2 | RJP_1, RNF_2 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD> | ARD, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF, BRD | BRF, BJD | BJF, BND | BNF, CRD | CRF, CJD | CJF, CND | CNF, RRD | RRF, RJD | RJF, RND | RNF>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
 
         BRD = never, BJD = never, BND = never,
         CRD = never, CJD = never, CND = never,
@@ -155,7 +155,7 @@ interface PromiseBase<TR, TJ, TN,
         CRD | CRF, CJD | CJF, CND | CNF,
         RRD | RRF, RJD | RJF, RND | RNF>;
     then<ARF = never, AJF = never, ANF = never,
->then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD | ARF_1 | ARP, AJD | AJF_1 | AJP, AND | ANF_1 | ANP, BRD | BRF_1 | BRP, BJD | BJF_1 | BJP, BND | BNF_1 | BNP, CRD | CRF_1 | CRP, CJD | CJF_1 | CJP, CND | CNF_1 | CNP, RRD | RRF_1 | RRP, RJD | RJF_1 | RJP, RND | RNF_1 | RNP>; <ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_2 | ARP_1, AJF_2 | AJP_1, ANF_2 | ANP_1, BRF_2 | BRP_1, BJF_2 | BJP_1, BNF_2 | BNP_1, CRF_2 | CRP_1, CJF_2 | CJP_1, CNF_2 | CNP_1, RRF_2 | RRP_1, RJF_2 | RJP_1, RNF_2 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARD_1 | ARF_3, AJD_1 | AJF_3, AND_1 | ANF_3, BRD_1 | BRF_3, BJD_1 | BJF_3, BND_1 | BNF_3, CRD_1 | CRF_3, CJD_1 | CJF_3, CND_1 | CNF_3, RRD_1 | RRF_3, RJD_1 | RJF_3, RND_1 | RNF_3>; <ARF_4 = never, AJF_4 = never, ANF_4 = never, BRF_4 = never, BJF_4 = never, BNF_4 = never, CRF_4 = never, CJF_4 = never, CNF_4 = never, RRF_4 = never, RJF_4 = never, RNF_4 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter?: null): PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
+>then : { <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never, ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD | PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD | ARF_1 | ARP, AJD | AJF_1 | AJP, AND | ANF_1 | ANP, BRD | BRF_1 | BRP, BJD | BJF_1 | BJP, BND | BNF_1 | BNP, CRD | CRF_1 | CRP, CJD | CJF_1 | CJP, CND | CNF_1 | CNP, RRD | RRF_1 | RRP, RJD | RJF_1 | RJP, RND | RNF_1 | RNP>; <ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_2 | ARP_1, AJF_2 | AJP_1, ANF_2 | ANP_1, BRF_2 | BRP_1, BJF_2 | BJP_1, BNF_2 | BNP_1, CRF_2 | CRP_1, CJF_2 | CJP_1, CNF_2 | CNP_1, RRF_2 | RRP_1, RJF_2 | RJP_1, RNF_2 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARD_1 | ARF_3, AJD_1 | AJF_3, AND_1 | ANF_3, BRD_1 | BRF_3, BJD_1 | BJF_3, BND_1 | BNF_3, CRD_1 | CRF_3, CJD_1 | CJF_3, CND_1 | CNF_3, RRD_1 | RRF_3, RJD_1 | RJF_3, RND_1 | RNF_3>; <ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF> | ARF, progressFilter?: null): PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter?: null, progressFilter?: null): PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2>; }
 
         BRF = never, BJF = never, BNF = never,
         CRF = never, CJF = never, CNF = never,
@@ -180,7 +180,7 @@ interface PromiseBase<TR, TJ, TN,
         CRF, CJF, CNF,
         RRF, RJF, RNF>;
     then<ARD = never, AJD = never, AND = never,
->then : { <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF | PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD_1 | ARF | ARP, AJD_1 | AJF | AJP, AND_1 | ANF | ANP, BRD_1 | BRF | BRP, BJD_1 | BJF | BJP, BND_1 | BNF | BNP, CRD_1 | CRF | CRP, CJD_1 | CJF | CJP, CND_1 | CNF | CNP, RRD_1 | RRF | RRP, RJD_1 | RJF | RJP, RND_1 | RNF | RNP>; <ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_1 | ARP_1, AJF_1 | AJP_1, ANF_1 | ANP_1, BRF_1 | BRP_1, BJF_1 | BJP_1, BNF_1 | BNP_1, CRF_1 | CRP_1, CJF_1 | CJP_1, CNF_1 | CNP_1, RRF_1 | RRP_1, RJF_1 | RJP_1, RNF_1 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never, ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter?: null): PromiseBase<ARD_2 | ARF_2, AJD_2 | AJF_2, AND_2 | ANF_2, BRD_2 | BRF_2, BJD_2 | BJF_2, BND_2 | BNF_2, CRD_2 | CRF_2, CJD_2 | CJF_2, CND_2 | CNF_2, RRD_2 | RRF_2, RJD_2 | RJF_2, RND_2 | RNF_2>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD_3 = never, AJD_3 = never, AND_3 = never, BRD_3 = never, BJD_3 = never, BND_3 = never, CRD_3 = never, CJD_3 = never, CND_3 = never, RRD_3 = never, RJD_3 = never, RND_3 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD> | ARD, failFilter?: null, progressFilter?: null): PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND>; }
+>then : { <ARD_1 = never, AJD_1 = never, AND_1 = never, BRD_1 = never, BJD_1 = never, BND_1 = never, CRD_1 = never, CJD_1 = never, CND_1 = never, RRD_1 = never, RJD_1 = never, RND_1 = never, ARF = never, AJF = never, ANF = never, BRF = never, BJF = never, BNF = never, CRF = never, CJF = never, CNF = never, RRF = never, RJF = never, RNF = never, ARP = never, AJP = never, ANP = never, BRP = never, BJP = never, BNP = never, CRP = never, CJP = never, CNP = never, RRP = never, RJP = never, RNP = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_1 | PromiseBase<ARD_1, AJD_1, AND_1, BRD_1, BJD_1, BND_1, CRD_1, CJD_1, CND_1, RRD_1, RJD_1, RND_1> | Thenable<ARD_1>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF | PromiseBase<ARF, AJF, ANF, BRF, BJF, BNF, CRF, CJF, CNF, RRF, RJF, RNF> | Thenable<ARF>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP | PromiseBase<ARP, AJP, ANP, BRP, BJP, BNP, CRP, CJP, CNP, RRP, RJP, RNP> | Thenable<ANP>): PromiseBase<ARD_1 | ARF | ARP, AJD_1 | AJF | AJP, AND_1 | ANF | ANP, BRD_1 | BRF | BRP, BJD_1 | BJF | BJP, BND_1 | BNF | BNP, CRD_1 | CRF | CRP, CJD_1 | CJF | CJP, CND_1 | CNF | CNP, RRD_1 | RRF | RRP, RJD_1 | RJF | RJP, RND_1 | RNF | RNP>; <ARF_1 = never, AJF_1 = never, ANF_1 = never, BRF_1 = never, BJF_1 = never, BNF_1 = never, CRF_1 = never, CJF_1 = never, CNF_1 = never, RRF_1 = never, RJF_1 = never, RNF_1 = never, ARP_1 = never, AJP_1 = never, ANP_1 = never, BRP_1 = never, BJP_1 = never, BNP_1 = never, CRP_1 = never, CJP_1 = never, CNP_1 = never, RRP_1 = never, RJP_1 = never, RNP_1 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_1 | PromiseBase<ARF_1, AJF_1, ANF_1, BRF_1, BJF_1, BNF_1, CRF_1, CJF_1, CNF_1, RRF_1, RJF_1, RNF_1> | Thenable<ARF_1>, progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_1 | PromiseBase<ARP_1, AJP_1, ANP_1, BRP_1, BJP_1, BNP_1, CRP_1, CJP_1, CNP_1, RRP_1, RJP_1, RNP_1> | Thenable<ANP_1>): PromiseBase<ARF_1 | ARP_1, AJF_1 | AJP_1, ANF_1 | ANP_1, BRF_1 | BRP_1, BJF_1 | BJP_1, BNF_1 | BNP_1, CRF_1 | CRP_1, CJF_1 | CJP_1, CNF_1 | CNP_1, RRF_1 | RRP_1, RJF_1 | RJP_1, RNF_1 | RNP_1>; <ARP_2 = never, AJP_2 = never, ANP_2 = never, BRP_2 = never, BJP_2 = never, BNP_2 = never, CRP_2 = never, CJP_2 = never, CNP_2 = never, RRP_2 = never, RJP_2 = never, RNP_2 = never>(doneFilter: null, failFilter: null, progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => ANP_2 | PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2> | Thenable<ANP_2>): PromiseBase<ARP_2, AJP_2, ANP_2, BRP_2, BJP_2, BNP_2, CRP_2, CJP_2, CNP_2, RRP_2, RJP_2, RNP_2>; <ARD_2 = never, AJD_2 = never, AND_2 = never, BRD_2 = never, BJD_2 = never, BND_2 = never, CRD_2 = never, CJD_2 = never, CND_2 = never, RRD_2 = never, RJD_2 = never, RND_2 = never, ARF_2 = never, AJF_2 = never, ANF_2 = never, BRF_2 = never, BJF_2 = never, BNF_2 = never, CRF_2 = never, CJF_2 = never, CNF_2 = never, RRF_2 = never, RJF_2 = never, RNF_2 = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => ARD_2 | PromiseBase<ARD_2, AJD_2, AND_2, BRD_2, BJD_2, BND_2, CRD_2, CJD_2, CND_2, RRD_2, RJD_2, RND_2> | Thenable<ARD_2>, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_2 | PromiseBase<ARF_2, AJF_2, ANF_2, BRF_2, BJF_2, BNF_2, CRF_2, CJF_2, CNF_2, RRF_2, RJF_2, RNF_2> | Thenable<ARF_2>, progressFilter?: null): PromiseBase<ARD_2 | ARF_2, AJD_2 | AJF_2, AND_2 | ANF_2, BRD_2 | BRF_2, BJD_2 | BJF_2, BND_2 | BNF_2, CRD_2 | CRF_2, CJD_2 | CJF_2, CND_2 | CNF_2, RRD_2 | RRF_2, RJD_2 | RJF_2, RND_2 | RNF_2>; <ARF_3 = never, AJF_3 = never, ANF_3 = never, BRF_3 = never, BJF_3 = never, BNF_3 = never, CRF_3 = never, CJF_3 = never, CNF_3 = never, RRF_3 = never, RJF_3 = never, RNF_3 = never>(doneFilter: null, failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => ARF_3 | PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3> | Thenable<ARF_3>, progressFilter?: null): PromiseBase<ARF_3, AJF_3, ANF_3, BRF_3, BJF_3, BNF_3, CRF_3, CJF_3, CNF_3, RRF_3, RJF_3, RNF_3>; <ARD = never, AJD = never, AND = never, BRD = never, BJD = never, BND = never, CRD = never, CJD = never, CND = never, RRD = never, RJD = never, RND = never>(doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND> | Thenable<ARD> | ARD, failFilter?: null, progressFilter?: null): PromiseBase<ARD, AJD, AND, BRD, BJD, BND, CRD, CJD, CND, RRD, RJD, RND>; }
 
         BRD = never, BJD = never, BND = never,
         CRD = never, CJD = never, CND = never,
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index d62f40ea9d4d8..f9a7bdbfdf637 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -27,7 +27,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >ctx : any
 
     static try<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
->try : { <R_1>(dit: typeof Promise, fn: () => Promise.Thenable<R_1>, args?: any[], ctx?: any): Promise<R_1>; <R_2>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
+>try : { <R_1>(dit: typeof Promise, fn: () => Promise.Thenable<R_1>, args?: any[], ctx?: any): Promise<R_1>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => R
@@ -44,7 +44,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >ctx : any
 
     static attempt<R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>;
->attempt : { <R_1>(dit: typeof Promise, fn: () => Promise.Thenable<R_1>, args?: any[], ctx?: any): Promise<R_1>; <R_2>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
+>attempt : { <R_1>(dit: typeof Promise, fn: () => Promise.Thenable<R_1>, args?: any[], ctx?: any): Promise<R_1>; <R>(dit: typeof Promise, fn: () => R, args?: any[], ctx?: any): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >fn : () => R
@@ -70,7 +70,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static resolve<R>(dit: typeof Promise, value: R): Promise<R>;
->resolve : { (dit: typeof Promise): Promise<void>; <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>): Promise<R_1>; <R_2>(dit: typeof Promise, value: R): Promise<R>; }
+>resolve : { (dit: typeof Promise): Promise<void>; <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>): Promise<R_1>; <R>(dit: typeof Promise, value: R): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
@@ -101,7 +101,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static cast<R>(dit: typeof Promise, value: R): Promise<R>;
->cast : { <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>): Promise<R_1>; <R_2>(dit: typeof Promise, value: R): Promise<R>; }
+>cast : { <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>): Promise<R_1>; <R>(dit: typeof Promise, value: R): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
@@ -132,7 +132,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >ms : number
 
     static delay<R>(dit: typeof Promise, value: R, ms: number): Promise<R>;
->delay : { <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>, ms: number): Promise<R_1>; <R_2>(dit: typeof Promise, value: R, ms: number): Promise<R>; (dit: typeof Promise, ms: number): Promise<void>; }
+>delay : { <R_1>(dit: typeof Promise, value: Promise.Thenable<R_1>, ms: number): Promise<R_1>; <R>(dit: typeof Promise, value: R, ms: number): Promise<R>; (dit: typeof Promise, ms: number): Promise<void>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >value : R
@@ -191,21 +191,21 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static all<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>;
->all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4[]>; }
+>all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2>[]): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
 
     static all<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>;
->all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4[]>; }
+>all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R[]>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
 
     static all<R>(dit: typeof Promise, values: R[]): Promise<R[]>;
->all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: R[]): Promise<R[]>; }
+>all : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3[]>; <R>(dit: typeof Promise, values: R[]): Promise<R[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -232,7 +232,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static settle<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>;
->settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<Promise.Inspection<R_3>[]>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<Promise.Inspection<R_4>[]>; }
+>settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<Promise.Inspection<R>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2>[]): Promise<Promise.Inspection<R_2>[]>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<Promise.Inspection<R_3>[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -240,7 +240,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static settle<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>;
->settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<Promise.Inspection<R_2>[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<Promise.Inspection<R_4>[]>; }
+>settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<Promise.Inspection<R_2>[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<Promise.Inspection<R>[]>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<Promise.Inspection<R_3>[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -248,7 +248,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static settle<R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>;
->settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<Promise.Inspection<R_2>[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<Promise.Inspection<R_3>[]>; <R_4>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>; }
+>settle : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<Promise.Inspection<R_1>[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<Promise.Inspection<R_2>[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<Promise.Inspection<R_3>[]>; <R>(dit: typeof Promise, values: R[]): Promise<Promise.Inspection<R>[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -263,21 +263,21 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static any<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
->any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4>; }
+>any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2>[]): Promise<R_2>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
 
     static any<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
->any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4>; }
+>any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
 
     static any<R>(dit: typeof Promise, values: R[]): Promise<R>;
->any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R_4>(dit: typeof Promise, values: R[]): Promise<R>; }
+>any : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -291,21 +291,21 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static race<R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>;
->race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4>; }
+>race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>): Promise<R>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2>[]): Promise<R_2>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
 >Promise : any
 
     static race<R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>;
->race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R_4>(dit: typeof Promise, values: R_4[]): Promise<R_4>; }
+>race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[]): Promise<R>; <R_3>(dit: typeof Promise, values: R_3[]): Promise<R_3>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
 >Promise : any
 
     static race<R>(dit: typeof Promise, values: R[]): Promise<R>;
->race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R_4>(dit: typeof Promise, values: R[]): Promise<R>; }
+>race : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>): Promise<R_1>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>): Promise<R_2>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[]): Promise<R_3>; <R>(dit: typeof Promise, values: R[]): Promise<R>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -320,7 +320,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >count : number
 
     static some<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>;
->some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[], count: number): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: R_4[], count: number): Promise<R_4[]>; }
+>some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, count: number): Promise<R[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2>[], count: number): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: R_3[], count: number): Promise<R_3[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -328,7 +328,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >count : number
 
     static some<R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>;
->some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, count: number): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R_4>(dit: typeof Promise, values: R_4[], count: number): Promise<R_4[]>; }
+>some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, count: number): Promise<R_2[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], count: number): Promise<R[]>; <R_3>(dit: typeof Promise, values: R_3[], count: number): Promise<R_3[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -336,7 +336,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >count : number
 
     static some<R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>;
->some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, count: number): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[], count: number): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
+>some : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, count: number): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, count: number): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3>[], count: number): Promise<R_3[]>; <R>(dit: typeof Promise, values: R[], count: number): Promise<R[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -350,7 +350,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static join<R>(dit: typeof Promise, ...values: R[]): Promise<R[]>;
->join : { <R_1>(dit: typeof Promise, ...values: Promise.Thenable<R_1>[]): Promise<R_1[]>; <R_2>(dit: typeof Promise, ...values: R[]): Promise<R[]>; }
+>join : { <R_1>(dit: typeof Promise, ...values: Promise.Thenable<R_1>[]): Promise<R_1[]>; <R>(dit: typeof Promise, ...values: R[]): Promise<R[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -369,7 +369,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, mapper: (item: R_2, index: number, arrayLength: number) => Promise.Thenable<U_2>): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => U_3): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], mapper: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => U_5): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: R_6[], mapper: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
@@ -381,7 +381,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => U_3): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], mapper: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => U_5): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: R_6[], mapper: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -393,7 +393,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], mapper: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => U_5): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: R_6[], mapper: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -404,7 +404,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => U_5): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: R_6[], mapper: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -416,7 +416,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static map<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; <R_6, U_6>(dit: typeof Promise, values: R_6[], mapper: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -427,7 +427,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_8, U_8>(dit: typeof Promise, values: R_8[], mapper: (item: R_8, index: number, arrayLength: number) => U_8): Promise<U_8[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => Promise.Thenable<U>): Promise<U[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => U_7): Promise<U_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -438,7 +438,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static map<R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>;
->map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R_8, U_8>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
+>map : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, mapper: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>): Promise<U_1[]>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, mapper: (item: R_2, index: number, arrayLength: number) => U_2): Promise<U_2[]>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, mapper: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>): Promise<U_3[]>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, mapper: (item: R_4, index: number, arrayLength: number) => U_4): Promise<U_4[]>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], mapper: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>): Promise<U_5[]>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], mapper: (item: R_6, index: number, arrayLength: number) => U_6): Promise<U_6[]>; <R_7, U_7>(dit: typeof Promise, values: R_7[], mapper: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>): Promise<U_7[]>; <R, U>(dit: typeof Promise, values: R[], mapper: (item: R, index: number, arrayLength: number) => U): Promise<U[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -463,7 +463,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R, U>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => Promise.Thenable<U_2>, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => U_3, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => U_5, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: R_6[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
@@ -477,7 +477,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => U_3, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => U_5, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: R_6[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -491,7 +491,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R[]>, reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => Promise.Thenable<U_4>, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => U_5, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: R_6[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -504,7 +504,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => U_5, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: R_6[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -518,7 +518,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R, U>(dit: typeof Promise, values: Promise.Thenable<R>[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; <R_6, U_6>(dit: typeof Promise, values: R_6[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => Promise.Thenable<U_6>, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -531,7 +531,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_8, U_8>(dit: typeof Promise, values: R_8[], reducer: (total: U_8, current: R_8, index: number, arrayLength: number) => U_8, initialValue?: U_8): Promise<U_8>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => Promise.Thenable<U>, initialValue?: U): Promise<U>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => U_7, initialValue?: U_7): Promise<U_7>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -544,7 +544,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >initialValue : U
 
     static reduce<R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>;
->reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R_8, U_8>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
+>reduce : { <R_1, U_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, reducer: (total: U_1, current: R_1, index: number, arrayLength: number) => Promise.Thenable<U_1>, initialValue?: U_1): Promise<U_1>; <R_2, U_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, reducer: (total: U_2, current: R_2, index: number, arrayLength: number) => U_2, initialValue?: U_2): Promise<U_2>; <R_3, U_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, reducer: (total: U_3, current: R_3, index: number, arrayLength: number) => Promise.Thenable<U_3>, initialValue?: U_3): Promise<U_3>; <R_4, U_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, reducer: (total: U_4, current: R_4, index: number, arrayLength: number) => U_4, initialValue?: U_4): Promise<U_4>; <R_5, U_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], reducer: (total: U_5, current: R_5, index: number, arrayLength: number) => Promise.Thenable<U_5>, initialValue?: U_5): Promise<U_5>; <R_6, U_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], reducer: (total: U_6, current: R_6, index: number, arrayLength: number) => U_6, initialValue?: U_6): Promise<U_6>; <R_7, U_7>(dit: typeof Promise, values: R_7[], reducer: (total: U_7, current: R_7, index: number, arrayLength: number) => Promise.Thenable<U_7>, initialValue?: U_7): Promise<U_7>; <R, U>(dit: typeof Promise, values: R[], reducer: (total: U, current: R, index: number, arrayLength: number) => U, initialValue?: U): Promise<U>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -569,7 +569,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R>[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<R_2[]>, filterer: (item: R_2, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => boolean): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], filterer: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => boolean): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: R_6[], filterer: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<Promise.Thenable<R>[]>
@@ -581,7 +581,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => boolean): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], filterer: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => boolean): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: R_6[], filterer: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -593,7 +593,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R[]>, filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4>[], filterer: (item: R_4, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => boolean): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: R_6[], filterer: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R[]>
@@ -604,7 +604,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => boolean): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: R_6[], filterer: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -616,7 +616,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static filter<R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R>(dit: typeof Promise, values: Promise.Thenable<R>[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; <R_6>(dit: typeof Promise, values: R_6[], filterer: (item: R_6, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : Promise.Thenable<R>[]
@@ -627,7 +627,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >arrayLength : number
 
     static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_8>(dit: typeof Promise, values: R_8[], filterer: (item: R_8, index: number, arrayLength: number) => boolean): Promise<R_8[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => boolean): Promise<R_7[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -638,7 +638,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 >Promise : any
 
     static filter<R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>;
->filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R_8>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
+>filter : { <R_1>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_1>[]>, filterer: (item: R_1, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_1[]>; <R_2>(dit: typeof Promise, values: Promise.Thenable<Promise.Thenable<R_2>[]>, filterer: (item: R_2, index: number, arrayLength: number) => boolean): Promise<R_2[]>; <R_3>(dit: typeof Promise, values: Promise.Thenable<R_3[]>, filterer: (item: R_3, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_3[]>; <R_4>(dit: typeof Promise, values: Promise.Thenable<R_4[]>, filterer: (item: R_4, index: number, arrayLength: number) => boolean): Promise<R_4[]>; <R_5>(dit: typeof Promise, values: Promise.Thenable<R_5>[], filterer: (item: R_5, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_5[]>; <R_6>(dit: typeof Promise, values: Promise.Thenable<R_6>[], filterer: (item: R_6, index: number, arrayLength: number) => boolean): Promise<R_6[]>; <R_7>(dit: typeof Promise, values: R_7[], filterer: (item: R_7, index: number, arrayLength: number) => Promise.Thenable<boolean>): Promise<R_7[]>; <R>(dit: typeof Promise, values: R[], filterer: (item: R, index: number, arrayLength: number) => boolean): Promise<R[]>; }
 >dit : typeof Promise
 >Promise : typeof Promise
 >values : R[]
@@ -658,21 +658,21 @@ export declare module Promise {
 >error : any
 
 		then<U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>;
->then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U_2>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U_3>(onFulfilled: (value: R) => U_3, onRejected: (error: any) => Thenable<U_3>): Thenable<U_3>; <U_4>(onFulfilled?: (value: R) => U_4, onRejected?: (error: any) => U_4): Thenable<U_4>; }
+>then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U>(onFulfilled: (value: R) => Thenable<U>, onRejected?: (error: any) => U): Thenable<U>; <U_2>(onFulfilled: (value: R) => U_2, onRejected: (error: any) => Thenable<U_2>): Thenable<U_2>; <U_3>(onFulfilled?: (value: R) => U_3, onRejected?: (error: any) => U_3): Thenable<U_3>; }
 >onFulfilled : (value: R) => Thenable<U>
 >value : R
 >onRejected : (error: any) => U
 >error : any
 
 		then<U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>;
->then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U_2>(onFulfilled: (value: R) => Thenable<U_2>, onRejected?: (error: any) => U_2): Thenable<U_2>; <U_3>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U_4>(onFulfilled?: (value: R) => U_4, onRejected?: (error: any) => U_4): Thenable<U_4>; }
+>then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U_2>(onFulfilled: (value: R) => Thenable<U_2>, onRejected?: (error: any) => U_2): Thenable<U_2>; <U>(onFulfilled: (value: R) => U, onRejected: (error: any) => Thenable<U>): Thenable<U>; <U_3>(onFulfilled?: (value: R) => U_3, onRejected?: (error: any) => U_3): Thenable<U_3>; }
 >onFulfilled : (value: R) => U
 >value : R
 >onRejected : (error: any) => Thenable<U>
 >error : any
 
 		then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>;
->then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U_2>(onFulfilled: (value: R) => Thenable<U_2>, onRejected?: (error: any) => U_2): Thenable<U_2>; <U_3>(onFulfilled: (value: R) => U_3, onRejected: (error: any) => Thenable<U_3>): Thenable<U_3>; <U_4>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
+>then : { <U_1>(onFulfilled: (value: R) => Thenable<U_1>, onRejected: (error: any) => Thenable<U_1>): Thenable<U_1>; <U_2>(onFulfilled: (value: R) => Thenable<U_2>, onRejected?: (error: any) => U_2): Thenable<U_2>; <U_3>(onFulfilled: (value: R) => U_3, onRejected: (error: any) => Thenable<U_3>): Thenable<U_3>; <U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): Thenable<U>; }
 >onFulfilled : (value: R) => U
 >value : R
 >onRejected : (error: any) => U
diff --git a/tests/baselines/reference/callChain.3.types b/tests/baselines/reference/callChain.3.types
index 04b3c2d02032d..feee4365c3f6a 100644
--- a/tests/baselines/reference/callChain.3.types
+++ b/tests/baselines/reference/callChain.3.types
@@ -5,7 +5,7 @@ declare function absorb<T>(): T;
 >absorb : <T>() => T
 
 declare const a: { m?<T>(obj: {x: T}): T } | undefined;
->a : { m?<T>(obj: { x: T; }): T; } | undefined
+>a : { m?<T>(obj: {    x: T;}): T; } | undefined
 >m : (<T>(obj: {    x: T;}) => T) | undefined
 >obj : { x: T; }
 >x : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index e663dd090d028..3e0c95356ae27 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -233,7 +233,7 @@ interface I extends A {
 >y : T
 
     a14: <T, U>(x: { a: T; b: U }) => T; // ok
->a14 : <T, U>(x: { a: T; b: U; }) => T
+>a14 : <T, U>(x: {    a: T;    b: U;}) => T
 >x : { a: T; b: U; }
 >a : T
 >b : U
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
index c493f65778a73..19516ba55bde1 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance3.types
@@ -185,7 +185,7 @@ module Errors {
 
         interface I6 extends A {
             a15: <T>(x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type
->a15 : <T>(x: { a: T; b: T; }) => T
+>a15 : <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -193,7 +193,7 @@ module Errors {
 
         interface I7 extends A {
             a15: <T extends Base>(x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string
->a15 : <T extends Base>(x: { a: T; b: T; }) => number
+>a15 : <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
index bc30e2f3fcaf0..2d5836fedf90a 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance4.types
@@ -52,7 +52,7 @@ interface A { // T
 >arg : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -60,13 +60,13 @@ interface A { // T
 >bar : T
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : <T>(x: { a: T; b: T; }) => T[]
+>a15 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -140,7 +140,7 @@ interface I extends A {
 >arg : T
 
     a11: <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
->a11 : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>a11 : <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -148,13 +148,13 @@ interface I extends A {
 >bar : U
 
     a15: <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
->a15 : <U, V>(x: { a: U; b: V; }) => U[]
+>a15 : <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
 
     a16: <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
->a16 : <T>(x: { a: T; b: T; }) => T[]
+>a16 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
index 1051543595877..bb866c1b5abb2 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
@@ -183,7 +183,7 @@ interface I extends B {
 >y : T
 
     a14: <T, U>(x: { a: T; b: U }) => T; // ok
->a14 : <T, U>(x: { a: T; b: U; }) => T
+>a14 : <T, U>(x: {    a: T;    b: U;}) => T
 >x : { a: T; b: U; }
 >a : T
 >b : U
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
index 1e09a35b27e2d..ac83097c9d5d5 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance6.types
@@ -54,7 +54,7 @@ interface A { // T
 >arg : T
 
     a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -62,13 +62,13 @@ interface A { // T
 >bar : T
 
     a15: <T>(x: { a: T; b: T }) => T[];
->a15 : <T>(x: { a: T; b: T; }) => T[]
+>a15 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -109,7 +109,7 @@ interface I5<T> extends A {
 
 interface I7<T> extends A {
     a11: <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : <U>(x: {    foo: T;}, y: { foo: U; bar: U; }) => Base
+>a11 : <U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
diff --git a/tests/baselines/reference/callbacksDontShareTypes.types b/tests/baselines/reference/callbacksDontShareTypes.types
index 43269fc3eb1ed..0d866799e8aa0 100644
--- a/tests/baselines/reference/callbacksDontShareTypes.types
+++ b/tests/baselines/reference/callbacksDontShareTypes.types
@@ -21,7 +21,7 @@ interface Combinators {
 >x : T
 
     map<T>(c: Collection<T>, f: (x: T) => any): Collection<any>;
->map : { <T_1, U>(c: Collection<T_1>, f: (x: T_1) => U): Collection<U>; <T_2>(c: Collection<T>, f: (x: T) => any): Collection<any>; }
+>map : { <T_1, U>(c: Collection<T_1>, f: (x: T_1) => U): Collection<U>; <T>(c: Collection<T>, f: (x: T) => any): Collection<any>; }
 >c : Collection<T>
 >f : (x: T) => any
 >x : T
diff --git a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
index 81e6e440584fa..af8936704ae64 100644
--- a/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
+++ b/tests/baselines/reference/chainedCallsWithTypeParameterConstrainedToOtherTypeParameter2.types
@@ -21,7 +21,7 @@ class Chain<T> {
         // Ok to go down the chain, but error to climb up the chain
         (new Chain(t)).then(tt => s).then(ss => t);
 >(new Chain(t)).then(tt => s).then(ss => t) : Chain<S>
->(new Chain(t)).then(tt => s).then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>(new Chain(t)).then(tt => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >(new Chain(t)).then(tt => s) : Chain<S>
 >(new Chain(t)).then : <S extends T>(cb: (x: T) => S) => Chain<S>
 >(new Chain(t)) : Chain<T>
@@ -32,7 +32,7 @@ class Chain<T> {
 >tt => s : (tt: T) => S
 >tt : T
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >ss => t : (ss: S) => T
 >ss : S
 >t : T
@@ -40,12 +40,12 @@ class Chain<T> {
         // But error to try to climb up the chain
         (new Chain(s)).then(ss => t);
 >(new Chain(s)).then(ss => t) : Chain<S>
->(new Chain(s)).then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>(new Chain(s)).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >(new Chain(s)) : Chain<S>
 >new Chain(s) : Chain<S>
 >Chain : typeof Chain
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >ss => t : (ss: S) => T
 >ss : S
 >t : T
@@ -77,24 +77,24 @@ class Chain<T> {
 
         (new Chain(s)).then(ss => s).then(ss => s).then(ss => s);
 >(new Chain(s)).then(ss => s).then(ss => s).then(ss => s) : Chain<S>
->(new Chain(s)).then(ss => s).then(ss => s).then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>(new Chain(s)).then(ss => s).then(ss => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >(new Chain(s)).then(ss => s).then(ss => s) : Chain<S>
->(new Chain(s)).then(ss => s).then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>(new Chain(s)).then(ss => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >(new Chain(s)).then(ss => s) : Chain<S>
->(new Chain(s)).then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>(new Chain(s)).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >(new Chain(s)) : Chain<S>
 >new Chain(s) : Chain<S>
 >Chain : typeof Chain
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
@@ -197,11 +197,11 @@ class Chain2<T extends I> {
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value.x : number
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s).value : S
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then(ss => s) : Chain2<S>
->(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >(new Chain2(i)).then(ii => s).then(ss => s).then(ss => s) : Chain2<S>
->(new Chain2(i)).then(ii => s).then(ss => s).then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>(new Chain2(i)).then(ii => s).then(ss => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >(new Chain2(i)).then(ii => s).then(ss => s) : Chain2<S>
->(new Chain2(i)).then(ii => s).then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>(new Chain2(i)).then(ii => s).then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >(new Chain2(i)).then(ii => s) : Chain2<S>
 >(new Chain2(i)).then : <S extends I>(cb: (x: I) => S) => Chain2<S>
 >(new Chain2(i)) : Chain2<I>
@@ -212,15 +212,15 @@ class Chain2<T extends I> {
 >ii => s : (ii: I) => S
 >ii : I
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
->then : <S extends S>(cb: (x: S) => S) => Chain2<S>
+>then : <S_1 extends S>(cb: (x: S) => S_1) => Chain2<S_1>
 >ss => s : (ss: S) => S
 >ss : S
 >s : S
diff --git a/tests/baselines/reference/circularInstantiationExpression.types b/tests/baselines/reference/circularInstantiationExpression.types
index 49fb9cb6cf901..65430d609db28 100644
--- a/tests/baselines/reference/circularInstantiationExpression.types
+++ b/tests/baselines/reference/circularInstantiationExpression.types
@@ -8,6 +8,6 @@ declare function foo<T>(t: T): typeof foo<T>;
 
 foo("");
 >foo("") : (t: string) => any
->foo : <T>(t: T) => (t: T) => any
+>foo : <T>(t: T) => typeof foo<T>
 >"" : ""
 
diff --git a/tests/baselines/reference/coAndContraVariantInferences3.types b/tests/baselines/reference/coAndContraVariantInferences3.types
index e3c4cffd38ba0..912777443420f 100644
--- a/tests/baselines/reference/coAndContraVariantInferences3.types
+++ b/tests/baselines/reference/coAndContraVariantInferences3.types
@@ -180,14 +180,14 @@ declare function every<T, U extends T>(array: readonly T[], callback: (element:
 >index : number
 
 declare function every<T, U extends T>(array: readonly T[] | undefined, callback: (element: T, index: number) => element is U): array is readonly U[] | undefined;
->every : { <T_1, U_1 extends T_1>(array: readonly T_1[], callback: (element: T_1, index: number) => element is U_1): array is readonly U_1[]; <T_2, U_2 extends T>(array: readonly T[] | undefined, callback: (element: T, index: number) => element is U): array is readonly U[] | undefined; <T_3>(array: readonly T_3[] | undefined, callback: (element: T_3, index: number) => boolean): boolean; }
+>every : { <T_1, U_1 extends T_1>(array: readonly T_1[], callback: (element: T_1, index: number) => element is U_1): array is readonly U_1[]; <T, U extends T>(array: readonly T[] | undefined, callback: (element: T, index: number) => element is U): array is readonly U[] | undefined; <T_2>(array: readonly T_2[] | undefined, callback: (element: T_2, index: number) => boolean): boolean; }
 >array : readonly T[] | undefined
 >callback : (element: T, index: number) => element is U
 >element : T
 >index : number
 
 declare function every<T>(array: readonly T[] | undefined, callback: (element: T, index: number) => boolean): boolean;
->every : { <T_1, U extends T_1>(array: readonly T_1[], callback: (element: T_1, index: number) => element is U): array is readonly U[]; <T_2, U_1 extends T_2>(array: readonly T_2[] | undefined, callback: (element: T_2, index: number) => element is U_1): array is readonly U_1[] | undefined; <T_3>(array: readonly T[] | undefined, callback: (element: T, index: number) => boolean): boolean; }
+>every : { <T_1, U extends T_1>(array: readonly T_1[], callback: (element: T_1, index: number) => element is U): array is readonly U[]; <T_2, U_1 extends T_2>(array: readonly T_2[] | undefined, callback: (element: T_2, index: number) => element is U_1): array is readonly U_1[] | undefined; <T>(array: readonly T[] | undefined, callback: (element: T, index: number) => boolean): boolean; }
 >array : readonly T[] | undefined
 >callback : (element: T, index: number) => boolean
 >element : T
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
index 3c61e30dc16ed..8fbbe76f6d8bf 100644
--- a/tests/baselines/reference/complexRecursiveCollections.types
+++ b/tests/baselines/reference/complexRecursiveCollections.types
@@ -32,7 +32,7 @@ interface Collection<K, V> {
 >context : any
 
     reduce<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
->reduce : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R_2>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
+>reduce : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
 >value : V
@@ -839,7 +839,7 @@ declare module Immutable {
 >otherCollection : Collection<any, U>
 
     zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>;
->zipWith : { <U_1, Z_1>(zipper: (value: T, otherValue: U_1) => Z_1, otherCollection: Collection<any, U_1>): OrderedSet<Z_1>; <U_2, V, Z_2>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>; <Z_3>(zipper: (...any: any[]) => Z_3, ...collections: Collection<any, any>[]): OrderedSet<Z_3>; }
+>zipWith : { <U_1, Z_1>(zipper: (value: T, otherValue: U_1) => Z_1, otherCollection: Collection<any, U_1>): OrderedSet<Z_1>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>; <Z_2>(zipper: (...any: any[]) => Z_2, ...collections: Collection<any, any>[]): OrderedSet<Z_2>; }
 >zipper : (value: T, otherValue: U, thirdValue: V) => Z
 >value : T
 >otherValue : U
@@ -848,7 +848,7 @@ declare module Immutable {
 >thirdCollection : Collection<any, V>
 
     zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>;
->zipWith : { <U, Z_1>(zipper: (value: T, otherValue: U) => Z_1, otherCollection: Collection<any, U>): OrderedSet<Z_1>; <U_1, V, Z_2>(zipper: (value: T, otherValue: U_1, thirdValue: V) => Z_2, otherCollection: Collection<any, U_1>, thirdCollection: Collection<any, V>): OrderedSet<Z_2>; <Z_3>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>; }
+>zipWith : { <U, Z_1>(zipper: (value: T, otherValue: U) => Z_1, otherCollection: Collection<any, U>): OrderedSet<Z_1>; <U_1, V, Z_2>(zipper: (value: T, otherValue: U_1, thirdValue: V) => Z_2, otherCollection: Collection<any, U_1>, thirdCollection: Collection<any, V>): OrderedSet<Z_2>; <Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>; }
 >zipper : (...any: Array<any>) => Z
 >any : any[]
 >collections : Collection<any, any>[]
@@ -1156,13 +1156,13 @@ declare module Immutable {
 >Seq : any
 
     export function Keyed<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
->Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V_2>(obj: { [key: string]: V; }): Seq.Keyed<string, V>; <K_1, V_3>(): Keyed<K_1, V_3>; (): Keyed<any, any>; }
+>Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: { [key: string]: V; }): Seq.Keyed<string, V>; <K_1, V_2>(): Keyed<K_1, V_2>; (): Keyed<any, any>; }
 >obj : { [key: string]: V; }
 >key : string
 >Seq : any
 
     export function Keyed<K, V>(): Seq.Keyed<K, V>;
->Keyed : { <K_1, V_1>(collection: Iterable<[K_1, V_1]>): Keyed<K_1, V_1>; <V_2>(obj: { [key: string]: V_2; }): Keyed<string, V_2>; <K_2, V_3>(): Seq.Keyed<K, V>; (): Keyed<any, any>; }
+>Keyed : { <K_1, V_1>(collection: Iterable<[K_1, V_1]>): Keyed<K_1, V_1>; <V_2>(obj: { [key: string]: V_2; }): Keyed<string, V_2>; <K, V>(): Seq.Keyed<K, V>; (): Keyed<any, any>; }
 >Seq : any
 
     export function Keyed(): Seq.Keyed<any, any>;
@@ -1500,7 +1500,7 @@ declare module Immutable {
 >Collection : any
 
     export function Keyed<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
->Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V_2>(obj: { [key: string]: V; }): Collection.Keyed<string, V>; }
+>Keyed : { <K, V_1>(collection: Iterable<[K, V_1]>): Keyed<K, V_1>; <V>(obj: { [key: string]: V; }): Collection.Keyed<string, V>; }
 >obj : { [key: string]: V; }
 >key : string
 >Collection : any
@@ -1652,7 +1652,7 @@ declare module Immutable {
 >Collection : any
 
       zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Collection.Indexed<Z>;
->zipWith : { <U_1, Z_1>(zipper: (value: T, otherValue: U_1) => Z_1, otherCollection: Collection<any, U_1>): Indexed<Z_1>; <U_2, V, Z_2>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Collection.Indexed<Z>; <Z_3>(zipper: (...any: any[]) => Z_3, ...collections: Collection<any, any>[]): Indexed<Z_3>; }
+>zipWith : { <U_1, Z_1>(zipper: (value: T, otherValue: U_1) => Z_1, otherCollection: Collection<any, U_1>): Indexed<Z_1>; <U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Collection.Indexed<Z>; <Z_2>(zipper: (...any: any[]) => Z_2, ...collections: Collection<any, any>[]): Indexed<Z_2>; }
 >zipper : (value: T, otherValue: U, thirdValue: V) => Z
 >value : T
 >otherValue : U
@@ -1662,7 +1662,7 @@ declare module Immutable {
 >Collection : any
 
       zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): Collection.Indexed<Z>;
->zipWith : { <U, Z_1>(zipper: (value: T, otherValue: U) => Z_1, otherCollection: Collection<any, U>): Indexed<Z_1>; <U_1, V, Z_2>(zipper: (value: T, otherValue: U_1, thirdValue: V) => Z_2, otherCollection: Collection<any, U_1>, thirdCollection: Collection<any, V>): Indexed<Z_2>; <Z_3>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): Collection.Indexed<Z>; }
+>zipWith : { <U, Z_1>(zipper: (value: T, otherValue: U) => Z_1, otherCollection: Collection<any, U>): Indexed<Z_1>; <U_1, V, Z_2>(zipper: (value: T, otherValue: U_1, thirdValue: V) => Z_2, otherCollection: Collection<any, U_1>, thirdCollection: Collection<any, V>): Indexed<Z_2>; <Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): Collection.Indexed<Z>; }
 >zipper : (...any: Array<any>) => Z
 >any : any[]
 >collections : Collection<any, any>[]
@@ -2110,7 +2110,7 @@ declare module Immutable {
 >context : any
 
     reduce<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
->reduce : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R_2>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
+>reduce : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
 >value : V
@@ -2128,7 +2128,7 @@ declare module Immutable {
 >context : any
 
     reduceRight<R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R;
->reduceRight : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R_2>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
+>reduceRight : { <R_1>(reducer: (reduction: R_1, value: V, key: K, iter: this) => R_1, initialReduction: R_1, context?: any): R_1; <R>(reducer: (reduction: V | R, value: V, key: K, iter: this) => R): R; }
 >reducer : (reduction: V | R, value: V, key: K, iter: this) => R
 >reduction : V | R
 >value : V
diff --git a/tests/baselines/reference/conditionalTypeDoesntSpinForever.types b/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
index 2c12cc2d00c76..e254493ad19ea 100644
--- a/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
+++ b/tests/baselines/reference/conditionalTypeDoesntSpinForever.types
@@ -40,7 +40,7 @@ export enum PubSubRecordIsStoredInRedisAsA {
 >name : any
 
       name: <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {name: TYPE}>
->name : <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & { name: TYPE; }>
+>name : <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {    name: TYPE;}>
 >t : TYPE
 >name : TYPE
     }
@@ -176,7 +176,7 @@ export enum PubSubRecordIsStoredInRedisAsA {
 >record : any
 
       identifier: <TYPE extends Partial<SO_FAR["record"]>>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {identifier: TYPE}>
->identifier : <TYPE extends Partial<SO_FAR["record"]>>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & { identifier: TYPE; }>
+>identifier : <TYPE extends Partial<SO_FAR["record"]>>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {    identifier: TYPE;}>
 >t : TYPE
 >identifier : TYPE
 
@@ -236,7 +236,7 @@ export enum PubSubRecordIsStoredInRedisAsA {
 >record : any
 
       record: <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {record: TYPE}>
->record : <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & { record: TYPE; }>
+>record : <TYPE>(t?: TYPE) => BuildPubSubRecordType<SO_FAR & {    record: TYPE;}>
 >t : TYPE
 >record : TYPE
     }
diff --git a/tests/baselines/reference/conditionalTypes1.js b/tests/baselines/reference/conditionalTypes1.js
index 667c4de7c09a4..b90f9f21605cc 100644
--- a/tests/baselines/reference/conditionalTypes1.js
+++ b/tests/baselines/reference/conditionalTypes1.js
@@ -649,7 +649,7 @@ type Foo<T> = T extends string ? boolean : number;
 type Bar<T> = T extends string ? boolean : number;
 declare const convert: <U>(value: Foo<U>) => Bar<U>;
 type Baz<T> = Foo<T>;
-declare const convert2: <T>(value: Foo<T>) => Foo<T>;
+declare const convert2: <T>(value: Foo<T>) => Baz<T>;
 declare function f31<T>(): void;
 declare function f32<T, U>(): void;
 declare function f33<T, U>(): void;
diff --git a/tests/baselines/reference/conditionalTypes1.types b/tests/baselines/reference/conditionalTypes1.types
index 881eecd821190..5a88fc36d0d79 100644
--- a/tests/baselines/reference/conditionalTypes1.types
+++ b/tests/baselines/reference/conditionalTypes1.types
@@ -789,8 +789,8 @@ type Baz<T> = Foo<T>;
 >Baz : Baz<T>
 
 const convert2 = <T>(value: Foo<T>): Baz<T> => value;
->convert2 : <T>(value: Foo<T>) => Foo<T>
-><T>(value: Foo<T>): Baz<T> => value : <T>(value: Foo<T>) => Foo<T>
+>convert2 : <T>(value: Foo<T>) => Baz<T>
+><T>(value: Foo<T>): Baz<T> => value : <T>(value: Foo<T>) => Baz<T>
 >value : Foo<T>
 >value : Foo<T>
 
diff --git a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types
index 46173b625832e..2f27a38d71b26 100644
--- a/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types
+++ b/tests/baselines/reference/conditionalTypesSimplifyWhenTrivial.types
@@ -59,8 +59,8 @@ type ExcludeWithDefault<T, U, D = never> = T extends U ? D : T;
 >ExcludeWithDefault : ExcludeWithDefault<T, U, D>
 
 const fn5 = <Params>(
->fn5 : <Params>(params: Pick<Params, ExcludeWithDefault<keyof Params, never, never>>) => Params
-><Params>(    params: Pick<Params, ExcludeWithDefault<keyof Params, never>>,): Params => params : <Params>(params: Pick<Params, ExcludeWithDefault<keyof Params, never, never>>) => Params
+>fn5 : <Params>(params: Pick<Params, ExcludeWithDefault<keyof Params, never>>) => Params
+><Params>(    params: Pick<Params, ExcludeWithDefault<keyof Params, never>>,): Params => params : <Params>(params: Pick<Params, ExcludeWithDefault<keyof Params, never>>) => Params
 
     params: Pick<Params, ExcludeWithDefault<keyof Params, never>>,
 >params : Pick<Params, ExcludeWithDefault<keyof Params, never, never>>
@@ -83,8 +83,8 @@ function fn6<T>(x: ExcludeWithDefault<T, never>) {
 }
 
 const fn7 = <Params>(
->fn7 : <Params>(params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params, never>>) => Params
-><Params>(    params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params>>,): Params => params : <Params>(params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params, never>>) => Params
+>fn7 : <Params>(params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params>>) => Params
+><Params>(    params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params>>,): Params => params : <Params>(params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params>>) => Params
 
     params: Pick<Params, ExtractWithDefault<keyof Params, keyof Params>>,
 >params : Pick<Params, ExtractWithDefault<keyof Params, keyof Params, never>>
diff --git a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.types b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.types
index 21b55ae75a2ef..64be2e260dda2 100644
--- a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.types
+++ b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.types
@@ -9,7 +9,7 @@ declare module "./index" {
 
     interface LoDashStatic {
       pick: <T extends object, U extends keyof T>(
->pick : <T extends object, U extends keyof T>(object: T, ...props: U[]) => Pick<T, U>
+>pick : <T extends object, U extends keyof T>(object: T, ...props: Array<U>) => Pick<T, U>
 
         object: T,
 >object : T
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.types b/tests/baselines/reference/constraintSatisfactionWithAny.types
index 96d7dd6ba72b0..f9e1bb8d1a538 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.types
@@ -14,7 +14,7 @@ function foo2<T extends { x: number }>(x: T): T { return null; }
 
 //function foo3<T extends T[]>(x: T): T { return null; }
 function foo4<T extends <T>(x: T) => void>(x: T): T { return null; }
->foo4 : <T_2 extends <T_1>(x: T_1) => void>(x: T) => T
+>foo4 : <T extends <T_1>(x: T_1) => void>(x: T) => T
 >x : T
 >x : T
 
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 0bed3a62c2184..2ff0dba4385c1 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -233,7 +233,7 @@ interface I extends A {
 >y : T
 
     a14: new <T, U>(x: { a: T; b: U }) => T; // ok
->a14 : new <T, U>(x: { a: T; b: U; }) => T
+>a14 : new <T, U>(x: {    a: T;    b: U;}) => T
 >x : { a: T; b: U; }
 >a : T
 >b : U
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
index 05dd7752d4573..e342e13f9b931 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance3.types
@@ -161,7 +161,7 @@ module Errors {
 
         interface I6 extends A {
             a15: new <T>(x: { a: T; b: T }) => T; // error, T is {} which isn't an acceptable return type
->a15 : new <T>(x: { a: T; b: T; }) => T
+>a15 : new <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -169,7 +169,7 @@ module Errors {
 
         interface I7 extends A {
             a15: new <T extends Base>(x: { a: T; b: T }) => number; // error, T defaults to Base, which is not compatible with number or string
->a15 : new <T extends Base>(x: { a: T; b: T; }) => number
+>a15 : new <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
index 34f2ba81784c6..ba6eafba0e9ad 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance4.types
@@ -52,7 +52,7 @@ interface A { // T
 >arg : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -60,13 +60,13 @@ interface A { // T
 >bar : T
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -160,7 +160,7 @@ interface I extends A {
 >arg : T
 
     a11: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; // ok
->a11 : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>a11 : new <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -168,13 +168,13 @@ interface I extends A {
 >bar : U
 
     a15: new <U, V>(x: { a: U; b: V; }) => U[]; // ok, T = U, T = V
->a15 : new <U, V>(x: { a: U; b: V; }) => U[]
+>a15 : new <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
 
     a16: new <T>(x: { a: T; b: T }) => T[]; // ok, more general parameter type
->a16 : new <T>(x: { a: T; b: T; }) => T[]
+>a16 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
index 586f63a410f87..8a9c1737fc4c0 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
@@ -183,7 +183,7 @@ interface I extends B {
 >y : T
 
     a14: new <T, U>(x: { a: T; b: U }) => T; // ok
->a14 : new <T, U>(x: { a: T; b: U; }) => T
+>a14 : new <T, U>(x: {    a: T;    b: U;}) => T
 >x : { a: T; b: U; }
 >a : T
 >b : U
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
index 065dd2478a504..7477c180797a4 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance6.types
@@ -54,7 +54,7 @@ interface A { // T
 >arg : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -62,13 +62,13 @@ interface A { // T
 >bar : T
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -109,7 +109,7 @@ interface I5<T> extends A {
 
 interface I7<T> extends A {
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : new <U>(x: {    foo: T;}, y: { foo: U; bar: U; }) => Base
+>a11 : new <U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
diff --git a/tests/baselines/reference/contravariantInferenceAndTypeGuard.types b/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
index 7007cde95a38e..7aedd6ea6d520 100644
--- a/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
+++ b/tests/baselines/reference/contravariantInferenceAndTypeGuard.types
@@ -34,11 +34,11 @@ declare class List<TData> {
 >context : TContext
 
     filter<TResult extends TData>(fn: FilterFn<TData, TResult>): List<TResult>;
->filter : { <TContext, TResult_1 extends TData>(fn: FilterFn<TData, TResult_1, TContext>, context: TContext): List<TResult_1>; <TResult_2 extends TData>(fn: FilterFn<TData, TResult>): List<TResult>; <TContext_1>(fn: IteratorFn<TData, boolean, TContext_1>, context: TContext_1): List<TData>; (fn: IteratorFn<TData, boolean, List<TData>>): List<TData>; }
+>filter : { <TContext, TResult_1 extends TData>(fn: FilterFn<TData, TResult_1, TContext>, context: TContext): List<TResult_1>; <TResult extends TData>(fn: FilterFn<TData, TResult>): List<TResult>; <TContext_1>(fn: IteratorFn<TData, boolean, TContext_1>, context: TContext_1): List<TData>; (fn: IteratorFn<TData, boolean, List<TData>>): List<TData>; }
 >fn : FilterFn<TData, TResult, List<TData>>
 
     filter<TContext>(fn: IteratorFn<TData, boolean, TContext>, context: TContext): List<TData>;
->filter : { <TContext_1, TResult extends TData>(fn: FilterFn<TData, TResult, TContext_1>, context: TContext_1): List<TResult>; <TResult_1 extends TData>(fn: FilterFn<TData, TResult_1, List<TData>>): List<TResult_1>; <TContext_2>(fn: IteratorFn<TData, boolean, TContext>, context: TContext): List<TData>; (fn: IteratorFn<TData, boolean, List<TData>>): List<TData>; }
+>filter : { <TContext_1, TResult extends TData>(fn: FilterFn<TData, TResult, TContext_1>, context: TContext_1): List<TResult>; <TResult_1 extends TData>(fn: FilterFn<TData, TResult_1, List<TData>>): List<TResult_1>; <TContext>(fn: IteratorFn<TData, boolean, TContext>, context: TContext): List<TData>; (fn: IteratorFn<TData, boolean, List<TData>>): List<TData>; }
 >fn : IteratorFn<TData, boolean, TContext>
 >context : TContext
 
diff --git a/tests/baselines/reference/correlatedUnions.js b/tests/baselines/reference/correlatedUnions.js
index 5335811054601..05e77d8b4d3e1 100644
--- a/tests/baselines/reference/correlatedUnions.js
+++ b/tests/baselines/reference/correlatedUnions.js
@@ -602,7 +602,7 @@ type SameKeys<T> = {
     };
 };
 type MappedFromOriginal = SameKeys<Original>;
-declare const getStringAndNumberFromOriginalAndMapped: <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], SameKeys<Original>[K][N]];
+declare const getStringAndNumberFromOriginalAndMapped: <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], MappedFromOriginal[K][N]];
 interface Config {
     string: string;
     number: number;
diff --git a/tests/baselines/reference/correlatedUnions.types b/tests/baselines/reference/correlatedUnions.types
index eb4c434c405ec..604656b968713 100644
--- a/tests/baselines/reference/correlatedUnions.types
+++ b/tests/baselines/reference/correlatedUnions.types
@@ -744,7 +744,7 @@ const ALL_BARS = [{ name: 'a'}, {name: 'b'}] as const;
 const BAR_LOOKUP = makeCompleteLookupMapping(ALL_BARS, 'name');
 >BAR_LOOKUP : { a: { readonly name: "a"; }; b: { readonly name: "b"; }; }
 >makeCompleteLookupMapping(ALL_BARS, 'name') : { a: { readonly name: "a"; }; b: { readonly name: "b"; }; }
->makeCompleteLookupMapping : <T extends readonly any[], Attr_1 extends keyof T[number]>(ops: T, attr: Attr_1) => { [Item in T[number] as Item[Attr_1]]: Item; }
+>makeCompleteLookupMapping : <T extends readonly any[], Attr extends keyof T[number]>(ops: T, attr: Attr) => { [Item in T[number] as Item[Attr]]: Item; }
 >ALL_BARS : readonly [{ readonly name: "a"; }, { readonly name: "b"; }]
 >'name' : "name"
 
@@ -797,8 +797,8 @@ type MappedFromOriginal = SameKeys<Original>;
 >MappedFromOriginal : SameKeys<Original>
 
 const getStringAndNumberFromOriginalAndMapped = <
->getStringAndNumberFromOriginalAndMapped : <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], SameKeys<Original>[K][N]]
-><  K extends KeyOfOriginal,  N extends NestedKeyOfOriginalFor<K>>(  original: Original,  mappedFromOriginal: MappedFromOriginal,  key: K,  nestedKey: N): [Original[K][N], MappedFromOriginal[K][N]] => {  return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];} : <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], SameKeys<Original>[K][N]]
+>getStringAndNumberFromOriginalAndMapped : <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], MappedFromOriginal[K][N]]
+><  K extends KeyOfOriginal,  N extends NestedKeyOfOriginalFor<K>>(  original: Original,  mappedFromOriginal: MappedFromOriginal,  key: K,  nestedKey: N): [Original[K][N], MappedFromOriginal[K][N]] => {  return [original[key][nestedKey], mappedFromOriginal[key][nestedKey]];} : <K extends keyof Original, N extends keyof Original[K]>(original: Original, mappedFromOriginal: MappedFromOriginal, key: K, nestedKey: N) => [Original[K][N], MappedFromOriginal[K][N]]
 
   K extends KeyOfOriginal,
   N extends NestedKeyOfOriginalFor<K>
diff --git a/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.js b/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.js
index 919d54f08d56f..cd939e0c70a1b 100644
--- a/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.js
+++ b/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.js
@@ -17,4 +17,4 @@ exports.fun = fun;
 
 
 //// [declarationEmitDistributiveConditionalWithInfer.d.ts]
-export declare const fun: (subFun: <Collection, Field extends keyof Collection>() => (Collection[Field] extends infer T ? T extends Collection[Field] ? T extends readonly (infer InnerArr)[] ? InnerArr : T : never : never)[]) => void;
+export declare const fun: (subFun: <Collection, Field extends keyof Collection>() => FlatArray<Collection[Field], 0>[]) => void;
diff --git a/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.types b/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.types
index b440e40d15755..9cb80f14cf92c 100644
--- a/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.types
+++ b/tests/baselines/reference/declarationEmitDistributiveConditionalWithInfer.types
@@ -3,11 +3,11 @@
 === declarationEmitDistributiveConditionalWithInfer.ts ===
 // This function's type is changed on declaration
 export const fun = (
->fun : (subFun: <Collection, Field extends keyof Collection>() => (Collection[Field] extends infer T ? T extends Collection[Field] ? T extends readonly (infer InnerArr)[] ? InnerArr : T : never : never)[]) => void
->(    subFun: <Collection, Field extends keyof Collection>()        => FlatArray<Collection[Field], 0>[]) => { } : (subFun: <Collection, Field extends keyof Collection>() => (Collection[Field] extends infer T ? T extends Collection[Field] ? T extends readonly (infer InnerArr)[] ? InnerArr : T : never : never)[]) => void
+>fun : (subFun: <Collection, Field extends keyof Collection>() => FlatArray<Collection[Field], 0>[]) => void
+>(    subFun: <Collection, Field extends keyof Collection>()        => FlatArray<Collection[Field], 0>[]) => { } : (subFun: <Collection, Field extends keyof Collection>() => FlatArray<Collection[Field], 0>[]) => void
 
     subFun: <Collection, Field extends keyof Collection>()
->subFun : <Collection, Field extends keyof Collection>() => (Collection[Field] extends infer T ? T extends Collection[Field] ? T extends readonly (infer InnerArr)[] ? InnerArr : T : never : never)[]
+>subFun : <Collection, Field extends keyof Collection>() => FlatArray<Collection[Field], 0>[]
 
         => FlatArray<Collection[Field], 0>[]) => { };
 
diff --git a/tests/baselines/reference/declarationEmitOverloadedPrivateInference.types b/tests/baselines/reference/declarationEmitOverloadedPrivateInference.types
index 7c611a05bc7f5..27a2b67888585 100644
--- a/tests/baselines/reference/declarationEmitOverloadedPrivateInference.types
+++ b/tests/baselines/reference/declarationEmitOverloadedPrivateInference.types
@@ -26,7 +26,7 @@ export class Wrapper {
 >options : T
 
     private proxy<T, U>(fn: (options?: T) => U, noArgs: true): (options?: T) => U;
->proxy : { <T_1, U_1>(fn: (options: T_1) => U_1): (options: T_1) => U_1; <T_2, U_2>(fn: (options?: T) => U, noArgs: true): (options?: T) => U; }
+>proxy : { <T_1, U_1>(fn: (options: T_1) => U_1): (options: T_1) => U_1; <T, U>(fn: (options?: T) => U, noArgs: true): (options?: T) => U; }
 >fn : (options?: T) => U
 >options : T
 >noArgs : true
diff --git a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
index fca79b431ed2a..dec8e1bbe65e9 100644
--- a/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
+++ b/tests/baselines/reference/declarationEmitPrivatePromiseLikeInterface.js
@@ -72,6 +72,6 @@ export interface HttpResponse<D extends unknown, E extends unknown = unknown> ex
     error: E;
 }
 export declare class HttpClient<SecurityDataType = unknown> {
-    request: <T = any, E = any>() => TPromise<HttpResponse<T, E>, any>;
+    request: <T = any, E = any>() => TPromise<HttpResponse<T, E>>;
 }
 export {};
diff --git a/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.types b/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.types
index e58c743abbf0b..afae11e60ede4 100644
--- a/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.types
+++ b/tests/baselines/reference/declarationEmitQualifiedAliasTypeArgument.types
@@ -38,15 +38,15 @@ import { T, Q } from "./lib";
 >Q : any
 
 import { create } from "./bbb";
->create : <T_1>() => () => import("bbb").INode<T_1>
+>create : <T>() => () => import("bbb").INode<T>
 
 export const fun = create<T>();
 >fun : () => import("bbb").INode<T>
 >create<T>() : () => import("bbb").INode<T>
->create : <T_1>() => () => import("bbb").INode<T_1>
+>create : <T>() => () => import("bbb").INode<T>
 
 export const fun2 = create<Q>();
 >fun2 : () => import("bbb").INode<Q>
 >create<Q>() : () => import("bbb").INode<Q>
->create : <T_1>() => () => import("bbb").INode<T_1>
+>create : <T>() => () => import("bbb").INode<T>
 
diff --git a/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.js b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.js
new file mode 100644
index 0000000000000..3e2c9794bc5de
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.js
@@ -0,0 +1,27 @@
+//// [tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts] ////
+
+//// [index.d.ts]
+export type Whatever = {x: string, y: number};
+export type Props<T, TThing = Whatever> = Omit<TThing, "y"> & Partial<TThing> & T;
+
+//// [index.ts]
+import { Props } from "react-select";
+
+export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
+export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
+
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomSelect2 = exports.CustomSelect1 = void 0;
+var CustomSelect1 = function (x) { };
+exports.CustomSelect1 = CustomSelect1;
+function CustomSelect2(x) { }
+exports.CustomSelect2 = CustomSelect2;
+
+
+//// [index.d.ts]
+import { Props } from "react-select";
+export declare const CustomSelect1: <Option>(x: Props<Option> & {}) => void;
+export declare function CustomSelect2<Option>(x: Props<Option> & {}): void;
diff --git a/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.symbols b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.symbols
new file mode 100644
index 0000000000000..8f41d1b219161
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.symbols
@@ -0,0 +1,37 @@
+//// [tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts] ////
+
+=== node_modules/react-select/index.d.ts ===
+export type Whatever = {x: string, y: number};
+>Whatever : Symbol(Whatever, Decl(index.d.ts, 0, 0))
+>x : Symbol(x, Decl(index.d.ts, 0, 24))
+>y : Symbol(y, Decl(index.d.ts, 0, 34))
+
+export type Props<T, TThing = Whatever> = Omit<TThing, "y"> & Partial<TThing> & T;
+>Props : Symbol(Props, Decl(index.d.ts, 0, 46))
+>T : Symbol(T, Decl(index.d.ts, 1, 18))
+>TThing : Symbol(TThing, Decl(index.d.ts, 1, 20))
+>Whatever : Symbol(Whatever, Decl(index.d.ts, 0, 0))
+>Omit : Symbol(Omit, Decl(lib.es5.d.ts, --, --))
+>TThing : Symbol(TThing, Decl(index.d.ts, 1, 20))
+>Partial : Symbol(Partial, Decl(lib.es5.d.ts, --, --))
+>TThing : Symbol(TThing, Decl(index.d.ts, 1, 20))
+>T : Symbol(T, Decl(index.d.ts, 1, 18))
+
+=== index.ts ===
+import { Props } from "react-select";
+>Props : Symbol(Props, Decl(index.ts, 0, 8))
+
+export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
+>CustomSelect1 : Symbol(CustomSelect1, Decl(index.ts, 2, 12))
+>Option : Symbol(Option, Decl(index.ts, 2, 30))
+>x : Symbol(x, Decl(index.ts, 2, 39))
+>Props : Symbol(Props, Decl(index.ts, 0, 8))
+>Option : Symbol(Option, Decl(index.ts, 2, 30))
+
+export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
+>CustomSelect2 : Symbol(CustomSelect2, Decl(index.ts, 2, 67))
+>Option : Symbol(Option, Decl(index.ts, 3, 30))
+>x : Symbol(x, Decl(index.ts, 3, 39))
+>Props : Symbol(Props, Decl(index.ts, 0, 8))
+>Option : Symbol(Option, Decl(index.ts, 3, 30))
+
diff --git a/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.types b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.types
new file mode 100644
index 0000000000000..392750a53d716
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitReusesLambdaParameterNodes.types
@@ -0,0 +1,24 @@
+//// [tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts] ////
+
+=== node_modules/react-select/index.d.ts ===
+export type Whatever = {x: string, y: number};
+>Whatever : { x: string; y: number; }
+>x : string
+>y : number
+
+export type Props<T, TThing = Whatever> = Omit<TThing, "y"> & Partial<TThing> & T;
+>Props : Props<T, TThing>
+
+=== index.ts ===
+import { Props } from "react-select";
+>Props : any
+
+export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
+>CustomSelect1 : <Option>(x: Props<Option> & {}) => void
+><Option,>(x: Props<Option> & {}) => {} : <Option>(x: Props<Option> & {}) => void
+>x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+
+export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
+>CustomSelect2 : <Option>(x: Props<Option> & {}) => void
+>x : Omit<import("node_modules/react-select/index").Whatever, "y"> & Partial<import("node_modules/react-select/index").Whatever> & Option
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.js b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.js
new file mode 100644
index 0000000000000..e69f942f7dbf6
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.js
@@ -0,0 +1,43 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts] ////
+
+//// [declarationEmitTypeParameterNameInOuterScope.ts]
+class A { }
+
+var a = <A,>(x: A) => x;
+function a2<A,>(x: A) { return x }
+
+var a3 = <A,>(x: A) => new A();
+function a4<A,>(x: A) { return new A() }
+
+
+interface B { }
+
+var b = <B,>(x: B) => x;
+function b2<B,>(x: B) { return x }
+
+
+//// [declarationEmitTypeParameterNameInOuterScope.js]
+var A = /** @class */ (function () {
+    function A() {
+    }
+    return A;
+}());
+var a = function (x) { return x; };
+function a2(x) { return x; }
+var a3 = function (x) { return new A(); };
+function a4(x) { return new A(); }
+var b = function (x) { return x; };
+function b2(x) { return x; }
+
+
+//// [declarationEmitTypeParameterNameInOuterScope.d.ts]
+declare class A {
+}
+declare var a: <A>(x: A) => A;
+declare function a2<A>(x: A): A;
+declare var a3: <A>(x: A) => globalThis.A;
+declare function a4<A>(x: A): globalThis.A;
+interface B {
+}
+declare var b: <B>(x: B) => B;
+declare function b2<B>(x: B): B;
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.symbols b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.symbols
new file mode 100644
index 0000000000000..4605797b8547b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.symbols
@@ -0,0 +1,52 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts] ////
+
+=== declarationEmitTypeParameterNameInOuterScope.ts ===
+class A { }
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 0, 0))
+
+var a = <A,>(x: A) => x;
+>a : Symbol(a, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 3))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 9))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 13))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 9))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 13))
+
+function a2<A,>(x: A) { return x }
+>a2 : Symbol(a2, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 2, 24))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 3, 12))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 3, 16))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 3, 12))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 3, 16))
+
+var a3 = <A,>(x: A) => new A();
+>a3 : Symbol(a3, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 5, 3))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 5, 10))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 5, 14))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 5, 10))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 0, 0))
+
+function a4<A,>(x: A) { return new A() }
+>a4 : Symbol(a4, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 5, 31))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 6, 12))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 6, 16))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 6, 12))
+>A : Symbol(A, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 0, 0))
+
+
+interface B { }
+>B : Symbol(B, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 6, 40))
+
+var b = <B,>(x: B) => x;
+>b : Symbol(b, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 3))
+>B : Symbol(B, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 9))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 13))
+>B : Symbol(B, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 9))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 13))
+
+function b2<B,>(x: B) { return x }
+>b2 : Symbol(b2, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 11, 24))
+>B : Symbol(B, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 12, 12))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 12, 16))
+>B : Symbol(B, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 12, 12))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameInOuterScope.ts, 12, 16))
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.types b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.types
new file mode 100644
index 0000000000000..d2a8b2152650b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameInOuterScope.types
@@ -0,0 +1,44 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts] ////
+
+=== declarationEmitTypeParameterNameInOuterScope.ts ===
+class A { }
+>A : A
+
+var a = <A,>(x: A) => x;
+>a : <A>(x: A) => A
+><A,>(x: A) => x : <A>(x: A) => A
+>x : A
+>x : A
+
+function a2<A,>(x: A) { return x }
+>a2 : <A>(x: A) => A
+>x : A
+>x : A
+
+var a3 = <A,>(x: A) => new A();
+>a3 : <A>(x: A) => globalThis.A
+><A,>(x: A) => new A() : <A>(x: A) => globalThis.A
+>x : A
+>new A() : globalThis.A
+>A : typeof A
+
+function a4<A,>(x: A) { return new A() }
+>a4 : <A>(x: A) => globalThis.A
+>x : A
+>new A() : globalThis.A
+>A : typeof A
+
+
+interface B { }
+
+var b = <B,>(x: B) => x;
+>b : <B>(x: B) => B
+><B,>(x: B) => x : <B>(x: B) => B
+>x : B
+>x : B
+
+function b2<B,>(x: B) { return x }
+>b2 : <B>(x: B) => B
+>x : B
+>x : B
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.js b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.js
new file mode 100644
index 0000000000000..7cb7af37bd3a2
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.js
@@ -0,0 +1,82 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts] ////
+
+//// [declarationEmitTypeParameterNameReusedInOverloads.ts]
+export class Base { foo: string; }
+export class Derived extends Base { bar: string; }
+export class Derived2 extends Derived { baz: string; }
+
+export type Foo = {
+    new (x: {
+        new <T extends Derived>(a: T): T;
+        new <T extends Base>(a: T): T;
+    }): any[];
+    new (x: {
+        new <T extends Derived2>(a: T): T;
+            new <T extends Base>(a: T): T;
+    }): any[];
+}
+
+
+//// [declarationEmitTypeParameterNameReusedInOverloads.js]
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Derived2 = exports.Derived = exports.Base = void 0;
+var Base = /** @class */ (function () {
+    function Base() {
+    }
+    return Base;
+}());
+exports.Base = Base;
+var Derived = /** @class */ (function (_super) {
+    __extends(Derived, _super);
+    function Derived() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return Derived;
+}(Base));
+exports.Derived = Derived;
+var Derived2 = /** @class */ (function (_super) {
+    __extends(Derived2, _super);
+    function Derived2() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return Derived2;
+}(Derived));
+exports.Derived2 = Derived2;
+
+
+//// [declarationEmitTypeParameterNameReusedInOverloads.d.ts]
+export declare class Base {
+    foo: string;
+}
+export declare class Derived extends Base {
+    bar: string;
+}
+export declare class Derived2 extends Derived {
+    baz: string;
+}
+export type Foo = {
+    new (x: {
+        new <T extends Derived>(a: T): T;
+        new <T extends Base>(a: T): T;
+    }): any[];
+    new (x: {
+        new <T extends Derived2>(a: T): T;
+        new <T extends Base>(a: T): T;
+    }): any[];
+};
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.symbols b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.symbols
new file mode 100644
index 0000000000000..2f803de250dc7
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.symbols
@@ -0,0 +1,58 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts] ////
+
+=== declarationEmitTypeParameterNameReusedInOverloads.ts ===
+export class Base { foo: string; }
+>Base : Symbol(Base, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 0))
+>foo : Symbol(Base.foo, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 19))
+
+export class Derived extends Base { bar: string; }
+>Derived : Symbol(Derived, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 34))
+>Base : Symbol(Base, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 0))
+>bar : Symbol(Derived.bar, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 1, 35))
+
+export class Derived2 extends Derived { baz: string; }
+>Derived2 : Symbol(Derived2, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 1, 50))
+>Derived : Symbol(Derived, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 34))
+>baz : Symbol(Derived2.baz, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 2, 39))
+
+export type Foo = {
+>Foo : Symbol(Foo, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 2, 54))
+
+    new (x: {
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 5, 9))
+
+        new <T extends Derived>(a: T): T;
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 6, 13))
+>Derived : Symbol(Derived, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 34))
+>a : Symbol(a, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 6, 32))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 6, 13))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 6, 13))
+
+        new <T extends Base>(a: T): T;
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 7, 13))
+>Base : Symbol(Base, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 0))
+>a : Symbol(a, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 7, 29))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 7, 13))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 7, 13))
+
+    }): any[];
+    new (x: {
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 9, 9))
+
+        new <T extends Derived2>(a: T): T;
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 10, 13))
+>Derived2 : Symbol(Derived2, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 1, 50))
+>a : Symbol(a, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 10, 33))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 10, 13))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 10, 13))
+
+            new <T extends Base>(a: T): T;
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 11, 17))
+>Base : Symbol(Base, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 0, 0))
+>a : Symbol(a, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 11, 33))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 11, 17))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameReusedInOverloads.ts, 11, 17))
+
+    }): any[];
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.types b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.types
new file mode 100644
index 0000000000000..e6cc3fc829bd6
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameReusedInOverloads.types
@@ -0,0 +1,42 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts] ////
+
+=== declarationEmitTypeParameterNameReusedInOverloads.ts ===
+export class Base { foo: string; }
+>Base : Base
+>foo : string
+
+export class Derived extends Base { bar: string; }
+>Derived : Derived
+>Base : Base
+>bar : string
+
+export class Derived2 extends Derived { baz: string; }
+>Derived2 : Derived2
+>Derived : Derived
+>baz : string
+
+export type Foo = {
+>Foo : { new (x: { new <T extends Derived>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }): any[]; new (x: { new <T_2 extends Derived2>(a: T_2): T_2; new <T_3 extends Base>(a: T_3): T_3; }): any[]; }
+
+    new (x: {
+>x : { new <T extends Derived>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
+
+        new <T extends Derived>(a: T): T;
+>a : T
+
+        new <T extends Base>(a: T): T;
+>a : T
+
+    }): any[];
+    new (x: {
+>x : { new <T extends Derived2>(a: T): T; new <T_1 extends Base>(a: T_1): T_1; }
+
+        new <T extends Derived2>(a: T): T;
+>a : T
+
+            new <T extends Base>(a: T): T;
+>a : T
+
+    }): any[];
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.js b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.js
new file mode 100644
index 0000000000000..ebc5136e73979
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.js
@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts] ////
+
+//// [declarationEmitTypeParameterNameShadowedInternally.ts]
+export const foo = <T,>(x: T) => {
+	const inner = <T,>(y: T) => [x, y] as const;
+	return inner;
+}
+
+
+//// [declarationEmitTypeParameterNameShadowedInternally.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.foo = void 0;
+var foo = function (x) {
+    var inner = function (y) { return [x, y]; };
+    return inner;
+};
+exports.foo = foo;
+
+
+//// [declarationEmitTypeParameterNameShadowedInternally.d.ts]
+export declare const foo: <T>(x: T) => <T_1>(y: T_1) => readonly [T, T_1];
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.symbols b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.symbols
new file mode 100644
index 0000000000000..09b0c3cb3f18f
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.symbols
@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts] ////
+
+=== declarationEmitTypeParameterNameShadowedInternally.ts ===
+export const foo = <T,>(x: T) => {
+>foo : Symbol(foo, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 0, 12))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 0, 20))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 0, 24))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 0, 20))
+
+	const inner = <T,>(y: T) => [x, y] as const;
+>inner : Symbol(inner, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 6))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 16))
+>y : Symbol(y, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 20))
+>T : Symbol(T, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 16))
+>x : Symbol(x, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 0, 24))
+>y : Symbol(y, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 20))
+>const : Symbol(const)
+
+	return inner;
+>inner : Symbol(inner, Decl(declarationEmitTypeParameterNameShadowedInternally.ts, 1, 6))
+}
+
diff --git a/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.types b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.types
new file mode 100644
index 0000000000000..5c47cb56446fe
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitTypeParameterNameShadowedInternally.types
@@ -0,0 +1,21 @@
+//// [tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts] ////
+
+=== declarationEmitTypeParameterNameShadowedInternally.ts ===
+export const foo = <T,>(x: T) => {
+>foo : <T>(x: T) => <T_1>(y: T_1) => readonly [T, T_1]
+><T,>(x: T) => {	const inner = <T,>(y: T) => [x, y] as const;	return inner;} : <T>(x: T) => <T_1>(y: T_1) => readonly [T, T_1]
+>x : T
+
+	const inner = <T,>(y: T) => [x, y] as const;
+>inner : <T_1>(y: T_1) => readonly [T, T_1]
+><T,>(y: T) => [x, y] as const : <T_1>(y: T_1) => readonly [T, T_1]
+>y : T
+>[x, y] as const : readonly [T_1, T]
+>[x, y] : readonly [T_1, T]
+>x : T_1
+>y : T
+
+	return inner;
+>inner : <T_1>(y: T_1) => readonly [T, T_1]
+}
+
diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
index 12e603a310728..edf999b5eeebb 100644
--- a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
+++ b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.types
@@ -50,8 +50,8 @@ export const updateIfChanged = <T>(t: T) => {
 >key : K
 
                 reduce<Value<K, U>>(u[key as keyof U] as Value<K, U>, (v: Value<K, U>) => {
->reduce<Value<K, U>>(u[key as keyof U] as Value<K, U>, (v: Value<K, U>) => {                    return update(Object.assign(Array.isArray(u) ? [] : {}, u, { [key]: v }));                }) : (<K extends keyof Value<K, U>>(key: K) => (<K_1 extends keyof Value<K, Value<K, U>>>(key: K) => (<K_2 extends keyof Value<K, Value<K, Value<K, U>>>>(key: K) => (<K_3 extends keyof Value<K, Value<K, Value<K, Value<K, U>>>>>(key: K) => (<K_4 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>(key: K) => (<K_5 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>(key: K) => (<K_6 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>(key: K) => (<K_7 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>(key: K) => (<K_8 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>(key: K) => (<K_9 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>(key: K) => (<K_10 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>>(key: K) => any & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, U>>>>) => Value<K, Value<K, Value<K, Value<K, U>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, U>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, U>>>) => Value<K, Value<K, Value<K, U>>>) => T; set: (newU: Value<K, Value<K, Value<K, U>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, U>>) => Value<K, Value<K, U>>) => T; set: (newU: Value<K, Value<K, U>>) => T; }) & { map: (updater: (u: Value<K, U>) => Value<K, U>) => T; set: (newU: Value<K, U>) => T; }
->reduce : <U>(u: U, update: (u: U) => T) => (<K extends keyof U>(key: K) => (<K_1 extends keyof Value<K, U>>(key: K) => (<K_2 extends keyof Value<K, Value<K, U>>>(key: K) => (<K_3 extends keyof Value<K, Value<K, Value<K, U>>>>(key: K) => (<K_4 extends keyof Value<K, Value<K, Value<K, Value<K, U>>>>>(key: K) => (<K_5 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>(key: K) => (<K_6 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>(key: K) => (<K_7 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>(key: K) => (<K_8 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>(key: K) => (<K_9 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>(key: K) => (<K_10 extends keyof Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>(key: K) => any & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, Value<K, U>>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, Value<K, U>>>>) => Value<K, Value<K, Value<K, Value<K, U>>>>) => T; set: (newU: Value<K, Value<K, Value<K, Value<K, U>>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, Value<K, U>>>) => Value<K, Value<K, Value<K, U>>>) => T; set: (newU: Value<K, Value<K, Value<K, U>>>) => T; }) & { map: (updater: (u: Value<K, Value<K, U>>) => Value<K, Value<K, U>>) => T; set: (newU: Value<K, Value<K, U>>) => T; }) & { map: (updater: (u: Value<K, U>) => Value<K, U>) => T; set: (newU: Value<K, U>) => T; }) & { map: (updater: (u: U) => U) => T; set: (newU: U) => T; }
+>reduce<Value<K, U>>(u[key as keyof U] as Value<K, U>, (v: Value<K, U>) => {                    return update(Object.assign(Array.isArray(u) ? [] : {}, u, { [key]: v }));                }) : (<K_1 extends keyof Value<K, U>>(key: K_1) => (<K_2 extends keyof Value<K_1, Value<K, U>>>(key: K_2) => (<K_3 extends keyof Value<K_2, Value<K_1, Value<K, U>>>>(key: K_3) => (<K_4 extends keyof Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>(key: K_4) => (<K_5 extends keyof Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>(key: K_5) => (<K_6 extends keyof Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>(key: K_6) => (<K_7 extends keyof Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>(key: K_7) => (<K_8 extends keyof Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>(key: K_8) => (<K_9 extends keyof Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>(key: K_9) => (<K_10 extends keyof Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>(key: K_10) => (<K_11 extends keyof Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>>(key: K_11) => any & { map: (updater: (u: Value<K_11, Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>>) => Value<K_11, Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>>) => T; set: (newU: Value<K_11, Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => T; set: (newU: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => T; set: (newU: Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => T; set: (newU: Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => T; set: (newU: Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => T; set: (newU: Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => T; }) & { map: (updater: (u: Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => T; set: (newU: Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => T; }) & { map: (updater: (u: Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => T; set: (newU: Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => T; }) & { map: (updater: (u: Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => T; set: (newU: Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => T; }) & { map: (updater: (u: Value<K_2, Value<K_1, Value<K, U>>>) => Value<K_2, Value<K_1, Value<K, U>>>) => T; set: (newU: Value<K_2, Value<K_1, Value<K, U>>>) => T; }) & { map: (updater: (u: Value<K_1, Value<K, U>>) => Value<K_1, Value<K, U>>) => T; set: (newU: Value<K_1, Value<K, U>>) => T; }) & { map: (updater: (u: Value<K, U>) => Value<K, U>) => T; set: (newU: Value<K, U>) => T; }
+>reduce : <U>(u: U, update: (u: U) => T) => (<K extends keyof U>(key: K) => (<K_1 extends keyof Value<K, U>>(key: K_1) => (<K_2 extends keyof Value<K_1, Value<K, U>>>(key: K_2) => (<K_3 extends keyof Value<K_2, Value<K_1, Value<K, U>>>>(key: K_3) => (<K_4 extends keyof Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>(key: K_4) => (<K_5 extends keyof Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>(key: K_5) => (<K_6 extends keyof Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>(key: K_6) => (<K_7 extends keyof Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>(key: K_7) => (<K_8 extends keyof Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>(key: K_8) => (<K_9 extends keyof Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>(key: K_9) => (<K_10 extends keyof Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>(key: K_10) => any & { map: (updater: (u: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => T; set: (newU: Value<K_10, Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => T; set: (newU: Value<K_9, Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => T; set: (newU: Value<K_8, Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => T; set: (newU: Value<K_7, Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>>) => T; }) & { map: (updater: (u: Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => T; set: (newU: Value<K_6, Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>>) => T; }) & { map: (updater: (u: Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => T; set: (newU: Value<K_5, Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>>) => T; }) & { map: (updater: (u: Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => T; set: (newU: Value<K_4, Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>>) => T; }) & { map: (updater: (u: Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => T; set: (newU: Value<K_3, Value<K_2, Value<K_1, Value<K, U>>>>) => T; }) & { map: (updater: (u: Value<K_2, Value<K_1, Value<K, U>>>) => Value<K_2, Value<K_1, Value<K, U>>>) => T; set: (newU: Value<K_2, Value<K_1, Value<K, U>>>) => T; }) & { map: (updater: (u: Value<K_1, Value<K, U>>) => Value<K_1, Value<K, U>>) => T; set: (newU: Value<K_1, Value<K, U>>) => T; }) & { map: (updater: (u: Value<K, U>) => Value<K, U>) => T; set: (newU: Value<K, U>) => T; }) & { map: (updater: (u: U) => U) => T; set: (newU: U) => T; }
 >u[key as keyof U] as Value<K, U> : Value<K, U>
 >u[key as keyof U] : U[keyof U]
 >u : U
@@ -126,8 +126,8 @@ export const testRecFun = <T extends Object>(parent: T) => {
 >child : U
 
             testRecFun<T & U>({ ...parent, ...child })
->testRecFun<T & U>({ ...parent, ...child }) : { result: T & U; deeper: <U extends Object>(child: U) => { result: T & U & U; deeper: <U_1 extends Object>(child: U) => { result: T & U & U & U; deeper: <U_2 extends Object>(child: U) => { result: T & U & U & U & U; deeper: <U_3 extends Object>(child: U) => { result: T & U & U & U & U & U; deeper: <U_4 extends Object>(child: U) => { result: T & U & U & U & U & U & U; deeper: <U_5 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U; deeper: <U_6 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U; deeper: <U_7 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U & U; deeper: <U_8 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U & U & U; deeper: <U_9 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U & U & U & U; deeper: <U_10 extends Object>(child: U) => any; }; }; }; }; }; }; }; }; }; }; }
->testRecFun : <T extends Object>(parent: T) => { result: T; deeper: <U extends Object>(child: U) => { result: T & U; deeper: <U_1 extends Object>(child: U) => { result: T & U & U; deeper: <U_2 extends Object>(child: U) => { result: T & U & U & U; deeper: <U_3 extends Object>(child: U) => { result: T & U & U & U & U; deeper: <U_4 extends Object>(child: U) => { result: T & U & U & U & U & U; deeper: <U_5 extends Object>(child: U) => { result: T & U & U & U & U & U & U; deeper: <U_6 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U; deeper: <U_7 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U; deeper: <U_8 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U & U; deeper: <U_9 extends Object>(child: U) => { result: T & U & U & U & U & U & U & U & U & U & U; deeper: <U_10 extends Object>(child: U) => any; }; }; }; }; }; }; }; }; }; }; }
+>testRecFun<T & U>({ ...parent, ...child }) : { result: T & U; deeper: <U_1 extends Object>(child: U_1) => { result: T & U & U_1; deeper: <U_2 extends Object>(child: U_2) => { result: T & U & U_1 & U_2; deeper: <U_3 extends Object>(child: U_3) => { result: T & U & U_1 & U_2 & U_3; deeper: <U_4 extends Object>(child: U_4) => { result: T & U & U_1 & U_2 & U_3 & U_4; deeper: <U_5 extends Object>(child: U_5) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5; deeper: <U_6 extends Object>(child: U_6) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6; deeper: <U_7 extends Object>(child: U_7) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7; deeper: <U_8 extends Object>(child: U_8) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7 & U_8; deeper: <U_9 extends Object>(child: U_9) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7 & U_8 & U_9; deeper: <U_10 extends Object>(child: U_10) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7 & U_8 & U_9 & U_10; deeper: <U_11 extends Object>(child: U_11) => any; }; }; }; }; }; }; }; }; }; }; }
+>testRecFun : <T extends Object>(parent: T) => { result: T; deeper: <U extends Object>(child: U) => { result: T & U; deeper: <U_1 extends Object>(child: U_1) => { result: T & U & U_1; deeper: <U_2 extends Object>(child: U_2) => { result: T & U & U_1 & U_2; deeper: <U_3 extends Object>(child: U_3) => { result: T & U & U_1 & U_2 & U_3; deeper: <U_4 extends Object>(child: U_4) => { result: T & U & U_1 & U_2 & U_3 & U_4; deeper: <U_5 extends Object>(child: U_5) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5; deeper: <U_6 extends Object>(child: U_6) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6; deeper: <U_7 extends Object>(child: U_7) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7; deeper: <U_8 extends Object>(child: U_8) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7 & U_8; deeper: <U_9 extends Object>(child: U_9) => { result: T & U & U_1 & U_2 & U_3 & U_4 & U_5 & U_6 & U_7 & U_8 & U_9; deeper: <U_10 extends Object>(child: U_10) => any; }; }; }; }; }; }; }; }; }; }; }
 >{ ...parent, ...child } : T & U
 >parent : T
 >child : U
diff --git a/tests/baselines/reference/decoratorOnTypeAlias.types b/tests/baselines/reference/decoratorOnTypeAlias.types
index 6938b10cb2e0a..06434b6386c90 100644
--- a/tests/baselines/reference/decoratorOnTypeAlias.types
+++ b/tests/baselines/reference/decoratorOnTypeAlias.types
@@ -6,7 +6,7 @@ declare function dec<T>(target: T): T;
 >target : T
 
 @dec
->dec : <T_1>(target: T_1) => T_1
+>dec : <T>(target: T) => T
 
 type T = number;
 >T : number
diff --git a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
index 665d8c2e13756..938c886fdeae5 100644
--- a/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
+++ b/tests/baselines/reference/doubleMixinConditionalTypeBaseClassWorks.types
@@ -6,8 +6,8 @@ type Constructor = new (...args: any[]) => {};
 >args : any[]
 
 const Mixin1 = <C extends Constructor>(Base: C) => class extends Base { private _fooPrivate: {}; }
->Mixin1 : <C_1 extends Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C_1
-><C extends Constructor>(Base: C) => class extends Base { private _fooPrivate: {}; } : <C_1 extends Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C_1
+>Mixin1 : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
+><C extends Constructor>(Base: C) => class extends Base { private _fooPrivate: {}; } : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >Base : C
 >class extends Base { private _fooPrivate: {}; } : { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >Base : {}
@@ -15,12 +15,12 @@ const Mixin1 = <C extends Constructor>(Base: C) => class extends Base { private
 
 type FooConstructor = typeof Mixin1 extends (a: Constructor) => infer Cls ? Cls : never;
 >FooConstructor : { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor
->Mixin1 : <C_1 extends Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C_1
+>Mixin1 : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >a : Constructor
 
 const Mixin2 = <C extends FooConstructor>(Base: C) => class extends Base {};
->Mixin2 : <C_1 extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C_1
-><C extends FooConstructor>(Base: C) => class extends Base {} : <C_1 extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C_1
+>Mixin2 : <C extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
+><C extends FooConstructor>(Base: C) => class extends Base {} : <C extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
 >Base : C
 >class extends Base {} : { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
 >Base : Mixin1<Constructor>.(Anonymous class)
@@ -28,8 +28,8 @@ const Mixin2 = <C extends FooConstructor>(Base: C) => class extends Base {};
 class C extends Mixin2(Mixin1(Object)) {}
 >C : C
 >Mixin2(Mixin1(Object)) : Mixin2<{ new (...args: any[]): Mixin1<ObjectConstructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & ObjectConstructor>.(Anonymous class) & Mixin1<ObjectConstructor>.(Anonymous class) & Object
->Mixin2 : <C_1 extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C_1
+>Mixin2 : <C extends { new (...args: any[]): Mixin1<Constructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin2<any>.(Anonymous class); } & C
 >Mixin1(Object) : { new (...args: any[]): Mixin1<ObjectConstructor>.(Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & ObjectConstructor
->Mixin1 : <C_1 extends Constructor>(Base: C_1) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C_1
+>Mixin1 : <C extends Constructor>(Base: C) => { new (...args: any[]): (Anonymous class); prototype: Mixin1<any>.(Anonymous class); } & C
 >Object : ObjectConstructor
 
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
index f2b16d7f6a277..7cbe7c5f083ff 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
@@ -14,7 +14,7 @@ interface Array<T> {
 >initialValue : T
 
     reduce<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U,
->reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T; <U_1>(callbackfn: (previousValue: U_1, currentValue: T, currentIndex: number, array: T[]) => U_1, initialValue: U_1): U_1; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U_2>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
+>reduce : { (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T; <U_1>(callbackfn: (previousValue: U_1, currentValue: T, currentIndex: number, array: T[]) => U_1, initialValue: U_1): U_1; (callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue?: T): T; <U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U; }
 >callbackfn : (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U
 >previousValue : U
 >currentValue : T
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
index d28e41bc02449..be32c7a69da8a 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly2.types
@@ -40,7 +40,7 @@ declare function bar<T>(x: T, func: (p: T) => T): T;
 >p : T
 
 declare function bar<T>(x: T, func: (p: T) => T): T;
->bar : { <T_1>(x: T_1, func: (p: T_1) => T_1): T_1; <T_2>(x: T, func: (p: T) => T): T; }
+>bar : { <T_1>(x: T_1, func: (p: T_1) => T_1): T_1; <T>(x: T, func: (p: T) => T): T; }
 >x : T
 >func : (p: T) => T
 >p : T
diff --git a/tests/baselines/reference/fixingTypeParametersRepeatedly3.types b/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
index 17961996eb438..e84f62399fcc9 100644
--- a/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
+++ b/tests/baselines/reference/fixingTypeParametersRepeatedly3.types
@@ -40,7 +40,7 @@ declare function bar<T>(x: T, func: (p: T) => T): T;
 >p : T
 
 declare function bar<T>(x: T, func: (p: T) => T): T;
->bar : { <T_1>(x: T_1, func: (p: T_1) => T_1): T_1; <T_2>(x: T, func: (p: T) => T): T; }
+>bar : { <T_1>(x: T_1, func: (p: T_1) => T_1): T_1; <T>(x: T, func: (p: T) => T): T; }
 >x : T
 >func : (p: T) => T
 >p : T
diff --git a/tests/baselines/reference/functionLiterals.types b/tests/baselines/reference/functionLiterals.types
index db5fcd843790e..17f64c39de6c8 100644
--- a/tests/baselines/reference/functionLiterals.types
+++ b/tests/baselines/reference/functionLiterals.types
@@ -196,7 +196,7 @@ var c2: {
 >x : T
 
     func4<T>(s: T): string;
->func4 : { <T_1>(x: T_1): number; <T_2>(s: T): string; }
+>func4 : { <T_1>(x: T_1): number; <T>(s: T): string; }
 >s : T
 
     func5: {
diff --git a/tests/baselines/reference/functionOverloadErrors.types b/tests/baselines/reference/functionOverloadErrors.types
index f30725307e382..fd5418cd10a51 100644
--- a/tests/baselines/reference/functionOverloadErrors.types
+++ b/tests/baselines/reference/functionOverloadErrors.types
@@ -130,7 +130,7 @@ function fn12<T extends List<List<any>>>();
 >fn12 : { <T extends List<List<any>>>(): any; <T_1 extends List<any>>(): any; }
 
 function fn12<T extends List<any>>();
->fn12 : { <T_1 extends List<List<any>>>(): any; <T_2 extends List<any>>(): any; }
+>fn12 : { <T_1 extends List<List<any>>>(): any; <T extends List<any>>(): any; }
 
 function fn12() { }
 >fn12 : { <T extends List<List<any>>>(): any; <T_1 extends List<any>>(): any; }
@@ -241,7 +241,7 @@ function fn15<T extends List<List<any>>>(): T;
 >fn15 : { <T extends List<List<any>>>(): T; <T_1 extends List<any>>(): T_1; }
 
 function fn15<T extends List<any>>(): T;
->fn15 : { <T_1 extends List<List<any>>>(): T_1; <T_2 extends List<any>>(): T; }
+>fn15 : { <T_1 extends List<List<any>>>(): T_1; <T extends List<any>>(): T; }
 
 function fn15() {
 >fn15 : { <T extends List<List<any>>>(): T; <T_1 extends List<any>>(): T_1; }
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity1.types b/tests/baselines/reference/functionOverloadsOnGenericArity1.types
index 88ba3efd7d58b..1462d723c2e30 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity1.types
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity1.types
@@ -7,7 +7,7 @@ interface C {
 >f : { <T>(): string; <T_1, U>(): string; }
 
    f<T, U>(): string; 
->f : { <T_1>(): string; <T_2, U>(): string; }
+>f : { <T_1>(): string; <T, U>(): string; }
  
    <T>(): string;
    <T, U>(): string; 
diff --git a/tests/baselines/reference/functionOverloadsOnGenericArity2.types b/tests/baselines/reference/functionOverloadsOnGenericArity2.types
index b164491bee435..5a838f7564f52 100644
--- a/tests/baselines/reference/functionOverloadsOnGenericArity2.types
+++ b/tests/baselines/reference/functionOverloadsOnGenericArity2.types
@@ -11,6 +11,6 @@ interface I {
 >p : string
 
     then<U, T>(p: string): Date;
->then : { (p: string): string; <U_1>(p: string): string; <U_2, T>(p: string): Date; }
+>then : { (p: string): string; <U_1>(p: string): string; <U, T>(p: string): Date; }
 >p : string
 }
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
index 4b8ed7f6134c6..d907313360a11 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
@@ -20,7 +20,7 @@ function Choice<T>(args: T[]): A<T>;
 >args : T[]
 
 function Choice<T>(...v_args: T[]): A<T>;
->Choice : { <T_1>(args: T_1[]): A<T_1>; <T_2>(...v_args: T[]): A<T>; }
+>Choice : { <T_1>(args: T_1[]): A<T_1>; <T>(...v_args: T[]): A<T>; }
 >v_args : T[]
 
 function Choice<T>(...v_args: any[]): A<T>{
diff --git a/tests/baselines/reference/functionTypeArgumentArityErrors.types b/tests/baselines/reference/functionTypeArgumentArityErrors.types
index c30f77ed4fedb..550e4b4220b09 100644
--- a/tests/baselines/reference/functionTypeArgumentArityErrors.types
+++ b/tests/baselines/reference/functionTypeArgumentArityErrors.types
@@ -6,7 +6,7 @@ declare function f1<A = any>(): void;
 >f1 : { <A = any>(): void; <A_1, B, C, D = any>(): void; }
 
 declare function f1<A, B, C, D = any>(): void;
->f1 : { <A_1 = any>(): void; <A_2, B, C, D = any>(): void; }
+>f1 : { <A_1 = any>(): void; <A, B, C, D = any>(): void; }
 
 f1<number, number>();
 >f1<number, number>() : void
@@ -21,7 +21,7 @@ declare function f2<A>(): void;
 >f2 : { <A>(): void; <A_1, B, C>(): void; }
 
 declare function f2<A, B, C>(): void;
->f2 : { <A_1>(): void; <A_2, B, C>(): void; }
+>f2 : { <A_1>(): void; <A, B, C>(): void; }
 
 f2<number, number>();
 >f2<number, number>() : void
diff --git a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
index a1f14fcec119c..e34ed16c8ab6e 100644
--- a/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
+++ b/tests/baselines/reference/genericCallToOverloadedMethodWithOverloadedArguments.types
@@ -71,7 +71,7 @@ module m3 {
 >x : T
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
->then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
+>then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
 >cb : (x: T) => Promise<U>
 >x : T
 >error : (error: any) => Promise<U>
@@ -106,7 +106,7 @@ module m4 {
 >x : T
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
->then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
+>then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
 >cb : (x: T) => Promise<U>
 >x : T
 >error : (error: any) => Promise<U>
@@ -145,14 +145,14 @@ module m5 {
 >x : T
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
->then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; <U_3>(cb: (x: T) => Promise<U_3>, error?: (error: any) => U_3, progress?: (preservation: any) => void): Promise<U_3>; }
+>then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; <U_2>(cb: (x: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (preservation: any) => void): Promise<U_2>; }
 >cb : (x: T) => Promise<U>
 >x : T
 >error : (error: any) => Promise<U>
 >error : any
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>;
->then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U_2>, error?: (error: any) => Promise<U_2>): Promise<U_2>; <U_3>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>; }
+>then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U_2>, error?: (error: any) => Promise<U_2>): Promise<U_2>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => U, progress?: (preservation: any) => void): Promise<U>; }
 >cb : (x: T) => Promise<U>
 >x : T
 >error : (error: any) => U
@@ -193,7 +193,7 @@ module m6 {
 >x : T
 
         then<U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>;
->then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U_2>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
+>then : { <U_1>(cb: (x: T) => Promise<U_1>): Promise<U_1>; <U>(cb: (x: T) => Promise<U>, error?: (error: any) => Promise<U>): Promise<U>; }
 >cb : (x: T) => Promise<U>
 >x : T
 >error : (error: any) => Promise<U>
diff --git a/tests/baselines/reference/genericClassesRedeclaration.types b/tests/baselines/reference/genericClassesRedeclaration.types
index e8b5a92a5f619..a2ee0056dfecb 100644
--- a/tests/baselines/reference/genericClassesRedeclaration.types
+++ b/tests/baselines/reference/genericClassesRedeclaration.types
@@ -168,7 +168,7 @@ declare module TypeScript {
 >s : string
     }
     function createIntrinsicsObject<T>(): IIndexable<T>;
->createIntrinsicsObject : { <T_1>(): IIndexable<T_1>; <T_2>(): IIndexable<T>; }
+>createIntrinsicsObject : { <T_1>(): IIndexable<T_1>; <T>(): IIndexable<T>; }
 
     interface IHashTable<T> {
         getAllKeys(): string[];
diff --git a/tests/baselines/reference/genericCombinators2.types b/tests/baselines/reference/genericCombinators2.types
index 52c8059977be3..4001adb49c1de 100644
--- a/tests/baselines/reference/genericCombinators2.types
+++ b/tests/baselines/reference/genericCombinators2.types
@@ -25,7 +25,7 @@ interface Combinators {
 >y : U
 
     map<T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>;
->map : { <T_1, U_1>(c: Collection<T_1, U_1>, f: (x: T_1, y: U_1) => any): Collection<any, any>; <T_2, U_2, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
+>map : { <T_1, U_1>(c: Collection<T_1, U_1>, f: (x: T_1, y: U_1) => any): Collection<any, any>; <T, U, V>(c: Collection<T, U>, f: (x: T, y: U) => V): Collection<T, V>; }
 >c : Collection<T, U>
 >f : (x: T, y: U) => V
 >x : T
diff --git a/tests/baselines/reference/genericFunctionInference1.types b/tests/baselines/reference/genericFunctionInference1.types
index fc0b360cd8c38..f51ff23ee1cfb 100644
--- a/tests/baselines/reference/genericFunctionInference1.types
+++ b/tests/baselines/reference/genericFunctionInference1.types
@@ -8,7 +8,7 @@ declare function pipe<A extends any[], B>(ab: (...args: A) => B): (...args: A) =
 >args : A
 
 declare function pipe<A extends any[], B, C>(ab: (...args: A) => B, bc: (b: B) => C): (...args: A) => C;
->pipe : { <A_1 extends any[], B_1>(ab: (...args: A_1) => B_1): (...args: A_1) => B_1; <A_2 extends any[], B_2, C>(ab: (...args: A) => B, bc: (b: B) => C): (...args: A) => C; <A_3 extends any[], B_3, C_1, D>(ab: (...args: A_3) => B_3, bc: (b: B_3) => C_1, cd: (c: C_1) => D): (...args: A_3) => D; }
+>pipe : { <A_1 extends any[], B_1>(ab: (...args: A_1) => B_1): (...args: A_1) => B_1; <A extends any[], B, C>(ab: (...args: A) => B, bc: (b: B) => C): (...args: A) => C; <A_2 extends any[], B_2, C_1, D>(ab: (...args: A_2) => B_2, bc: (b: B_2) => C_1, cd: (c: C_1) => D): (...args: A_2) => D; }
 >ab : (...args: A) => B
 >args : A
 >bc : (b: B) => C
@@ -16,7 +16,7 @@ declare function pipe<A extends any[], B, C>(ab: (...args: A) => B, bc: (b: B) =
 >args : A
 
 declare function pipe<A extends any[], B, C, D>(ab: (...args: A) => B, bc: (b: B) => C, cd: (c: C) => D): (...args: A) => D;
->pipe : { <A_1 extends any[], B_1>(ab: (...args: A_1) => B_1): (...args: A_1) => B_1; <A_2 extends any[], B_2, C_1>(ab: (...args: A_2) => B_2, bc: (b: B_2) => C_1): (...args: A_2) => C_1; <A_3 extends any[], B_3, C_2, D>(ab: (...args: A) => B, bc: (b: B) => C, cd: (c: C) => D): (...args: A) => D; }
+>pipe : { <A_1 extends any[], B_1>(ab: (...args: A_1) => B_1): (...args: A_1) => B_1; <A_2 extends any[], B_2, C_1>(ab: (...args: A_2) => B_2, bc: (b: B_2) => C_1): (...args: A_2) => C_1; <A extends any[], B, C, D>(ab: (...args: A) => B, bc: (b: B) => C, cd: (c: C) => D): (...args: A) => D; }
 >ab : (...args: A) => B
 >args : A
 >bc : (b: B) => C
@@ -167,7 +167,7 @@ const g00: <T>(x: T) => T[] = pipe(list);
 >list : <T>(a: T) => T[]
 
 const g01: <T>(x: T) => { value: T[] } = pipe(list, box);
->g01 : <T>(x: T) => { value: T[]; }
+>g01 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(list, box) : (a: T) => { value: T[]; }
@@ -176,7 +176,7 @@ const g01: <T>(x: T) => { value: T[] } = pipe(list, box);
 >box : <V>(x: V) => { value: V; }
 
 const g02: <T>(x: T) => { value: T }[] = pipe(box, list);
->g02 : <T>(x: T) => { value: T; }[]
+>g02 : <T>(x: T) => {    value: T;}[]
 >x : T
 >value : T
 >pipe(box, list) : (x: T) => { value: T; }[]
@@ -185,7 +185,7 @@ const g02: <T>(x: T) => { value: T }[] = pipe(box, list);
 >list : <T>(a: T) => T[]
 
 const g03: <T>(x: T) => { value: T[] } = pipe(x => list(x), box);
->g03 : <T>(x: T) => { value: T[]; }
+>g03 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(x => list(x), box) : (x: T) => { value: T[]; }
@@ -198,7 +198,7 @@ const g03: <T>(x: T) => { value: T[] } = pipe(x => list(x), box);
 >box : <V>(x: V) => { value: V; }
 
 const g04: <T>(x: T) => { value: T[] } = pipe(list, x => box(x));
->g04 : <T>(x: T) => { value: T[]; }
+>g04 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(list, x => box(x)) : (a: T) => { value: T[]; }
@@ -211,7 +211,7 @@ const g04: <T>(x: T) => { value: T[] } = pipe(list, x => box(x));
 >x : T[]
 
 const g05: <T>(x: T) => { value: T[] } = pipe(x => list(x), x => box(x))
->g05 : <T>(x: T) => { value: T[]; }
+>g05 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(x => list(x), x => box(x)) : (x: T) => { value: T[]; }
@@ -228,7 +228,7 @@ const g05: <T>(x: T) => { value: T[] } = pipe(x => list(x), x => box(x))
 >x : T[]
 
 const g06: <T>(x: T) => { value: T[] } = pipe(list, pipe(box));
->g06 : <T>(x: T) => { value: T[]; }
+>g06 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(list, pipe(box)) : (a: T) => { value: T[]; }
@@ -239,7 +239,7 @@ const g06: <T>(x: T) => { value: T[] } = pipe(list, pipe(box));
 >box : <V>(x: V) => { value: V; }
 
 const g07: <T>(x: T) => { value: T[] } = pipe(x => list(x), pipe(box));
->g07 : <T>(x: T) => { value: T[]; }
+>g07 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(x => list(x), pipe(box)) : (x: T) => { value: T[]; }
@@ -254,7 +254,7 @@ const g07: <T>(x: T) => { value: T[] } = pipe(x => list(x), pipe(box));
 >box : <V>(x: V) => { value: V; }
 
 const g08: <T>(x: T) => { value: T[] } = pipe(x => list(x), pipe(x => box(x)));
->g08 : <T>(x: T) => { value: T[]; }
+>g08 : <T>(x: T) => {    value: T[];}
 >x : T
 >value : T[]
 >pipe(x => list(x), pipe(x => box(x))) : (x: T) => { value: T[]; }
diff --git a/tests/baselines/reference/genericFunctionParameters.types b/tests/baselines/reference/genericFunctionParameters.types
index 769eb8dfc73b6..e2549fac1199b 100644
--- a/tests/baselines/reference/genericFunctionParameters.types
+++ b/tests/baselines/reference/genericFunctionParameters.types
@@ -44,7 +44,7 @@ let x3 = f3(x => x);  // Array<any>
 
 declare const s: <R>(go: <S>(ops: { init(): S; }) => R) => R;
 >s : <R>(go: <S>(ops: { init(): S; }) => R) => R
->go : <S>(ops: { init(): S; }) => R
+>go : <S>(ops: {    init(): S;}) => R
 >ops : { init(): S; }
 >init : () => S
 
diff --git a/tests/baselines/reference/genericOverloadSignatures.types b/tests/baselines/reference/genericOverloadSignatures.types
index 2de7c3b8277a0..ba14576f15e11 100644
--- a/tests/baselines/reference/genericOverloadSignatures.types
+++ b/tests/baselines/reference/genericOverloadSignatures.types
@@ -14,7 +14,7 @@ function f<T>(a: T);
 >a : T
 
 function f<T>(a: T);
->f : { <T_1>(a: T_1): any; <T_2>(a: T): any; }
+>f : { <T_1>(a: T_1): any; <T>(a: T): any; }
 >a : T
 
 function f(a) { }
@@ -27,7 +27,7 @@ interface I2 {
 >x : T
 
     f<T>(x: T): string;
->f : { <T_1>(x: T_1): number; <T_2>(x: T): string; }
+>f : { <T_1>(x: T_1): number; <T>(x: T): string; }
 >x : T
 }
 
diff --git a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
index f3a3711f628a0..29aef5e1af890 100644
--- a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
+++ b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
@@ -12,7 +12,7 @@ interface IEnumerable<T> {
 >index : number
 
     zip<TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
->zip : { <TResult_1>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult_1): IEnumerable<TResult_1>; <TResult_2>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult_3>(...params: any[]): IEnumerable<TResult_3>; }
+>zip : { <TResult_1>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult_1): IEnumerable<TResult_1>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult_2>(...params: any[]): IEnumerable<TResult_2>; }
 >second : T[]
 >resultSelector : (first: T, second: T, index: number) => TResult
 >first : T
@@ -20,7 +20,7 @@ interface IEnumerable<T> {
 >index : number
 
     zip<TResult>(...params: any[]): IEnumerable<TResult>; // last one is selector
->zip : { <TResult_1>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult_1): IEnumerable<TResult_1>; <TResult_2>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult_2): IEnumerable<TResult_2>; <TResult_3>(...params: any[]): IEnumerable<TResult>; }
+>zip : { <TResult_1>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult_1): IEnumerable<TResult_1>; <TResult_2>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult_2): IEnumerable<TResult_2>; <TResult>(...params: any[]): IEnumerable<TResult>; }
 >params : any[]
 
     merge<TResult>(...params: IEnumerable<T>[]): IEnumerable<T>;
@@ -28,7 +28,7 @@ interface IEnumerable<T> {
 >params : IEnumerable<T>[]
 
     merge<TResult>(...params: T[][]): IEnumerable<T>;
->merge : { <TResult_1>(...params: IEnumerable<T>[]): IEnumerable<T>; <TResult_2>(...params: T[][]): IEnumerable<T>; }
+>merge : { <TResult_1>(...params: IEnumerable<T>[]): IEnumerable<T>; <TResult>(...params: T[][]): IEnumerable<T>; }
 >params : T[][]
 
 
@@ -60,7 +60,7 @@ interface IEnumerable<T> {
 >second : T[]
 
     sequenceEqual<TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean;   
->sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare_1>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare_1): boolean; (second: T[]): boolean; <TCompare_2>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
+>sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare_1>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare_1): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
 >second : T[]
 >compareSelector : (element: T) => TCompare
 >element : T
@@ -71,14 +71,14 @@ interface IEnumerable<T> {
 >element : T
 
     toDictionary<TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>;
->toDictionary : { <TKey_1>(keySelector: (element: T) => TKey_1): IDictionary<TKey_1, any>; <TKey_2, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>; <TKey_3, TValue_1, TCompare>(keySelector: (element: T) => TKey_3, elementSelector: (element: T) => TValue_1, compareSelector: (key: TKey_3) => TCompare): IDictionary<TKey_3, TValue_1>; }
+>toDictionary : { <TKey_1>(keySelector: (element: T) => TKey_1): IDictionary<TKey_1, any>; <TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>; <TKey_2, TValue_1, TCompare>(keySelector: (element: T) => TKey_2, elementSelector: (element: T) => TValue_1, compareSelector: (key: TKey_2) => TCompare): IDictionary<TKey_2, TValue_1>; }
 >keySelector : (element: T) => TKey
 >element : T
 >elementSelector : (element: T) => TValue
 >element : T
 
     toDictionary<TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>;
->toDictionary : { <TKey_1>(keySelector: (element: T) => TKey_1): IDictionary<TKey_1, any>; <TKey_2, TValue_1>(keySelector: (element: T) => TKey_2, elementSelector: (element: T) => TValue_1): IDictionary<TKey_2, TValue_1>; <TKey_3, TValue_2, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>; }
+>toDictionary : { <TKey_1>(keySelector: (element: T) => TKey_1): IDictionary<TKey_1, any>; <TKey_2, TValue_1>(keySelector: (element: T) => TKey_2, elementSelector: (element: T) => TValue_1): IDictionary<TKey_2, TValue_1>; <TKey, TValue, TCompare>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue, compareSelector: (key: TKey) => TCompare): IDictionary<TKey, TValue>; }
 >keySelector : (element: T) => TKey
 >element : T
 >elementSelector : (element: T) => TValue
diff --git a/tests/baselines/reference/grammarAmbiguities.types b/tests/baselines/reference/grammarAmbiguities.types
index 88ecd7d422b35..e4f63fedbb0b5 100644
--- a/tests/baselines/reference/grammarAmbiguities.types
+++ b/tests/baselines/reference/grammarAmbiguities.types
@@ -19,14 +19,14 @@ f(g<A, B>(7));
 >f(g<A, B>(7)) : any
 >f : (n: any) => any
 >g<A, B>(7) : any
->g : <A_1, B_1>(x: any) => any
+>g : <A, B>(x: any) => any
 >7 : 7
 
 f(g < A, B > 7); // Should error
 >f(g < A, B > 7) : any
 >f : (n: any) => any
 >g < A : boolean
->g : <A_1, B_1>(x: any) => any
+>g : <A, B>(x: any) => any
 >A : any
 >B > 7 : boolean
 >B : any
@@ -36,7 +36,7 @@ f(g < A, B > +(7)); // Should error
 >f(g < A, B > +(7)) : any
 >f : (n: any) => any
 >g < A : boolean
->g : <A_1, B_1>(x: any) => any
+>g : <A, B>(x: any) => any
 >A : any
 >B > +(7) : boolean
 >B : any
diff --git a/tests/baselines/reference/inferTypes1.types b/tests/baselines/reference/inferTypes1.types
index f3b34af033753..3ce2bf2dd5011 100644
--- a/tests/baselines/reference/inferTypes1.types
+++ b/tests/baselines/reference/inferTypes1.types
@@ -480,7 +480,7 @@ const result = invoker('test', true)({ test: (a: boolean) => 123 })
 >result : number
 >invoker('test', true)({ test: (a: boolean) => 123 }) : number
 >invoker('test', true) : <T extends Record<"test", (args_0: boolean) => any>>(obj: T) => ReturnType<T["test"]>
->invoker : <K extends string | number | symbol, A_1 extends any[]>(key: K, ...args: A_1) => <T extends Record<K, (...args: A_1) => any>>(obj: T) => ReturnType<T[K]>
+>invoker : <K extends string | number | symbol, A extends any[]>(key: K, ...args: A) => <T extends Record<K, (...args: A) => any>>(obj: T) => ReturnType<T[K]>
 >'test' : "test"
 >true : true
 >{ test: (a: boolean) => 123 } : { test: (a: boolean) => number; }
diff --git a/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types b/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
index 1e2a96b305ede..fb0cadb30bedc 100644
--- a/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
+++ b/tests/baselines/reference/inferenceDoesNotAddUndefinedOrNull.types
@@ -17,7 +17,7 @@ declare function toArray<T>(value: T | T[]): T[];
 >value : T | T[]
 
 declare function toArray<T>(value: T | readonly T[]): readonly T[];
->toArray : { <T_1>(value: T_1 | T_1[]): T_1[]; <T_2>(value: T | readonly T[]): readonly T[]; }
+>toArray : { <T_1>(value: T_1 | T_1[]): T_1[]; <T>(value: T | readonly T[]): readonly T[]; }
 >value : T | readonly T[]
 
 function flatMapChildren<T>(node: Node, cb: (child: Node) => readonly T[] | T | undefined): readonly T[] {
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.types b/tests/baselines/reference/infinitelyExpandingTypes5.types
index 9ba91ec0090eb..be550893143fe 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.types
@@ -19,7 +19,7 @@ function from<T>(array: T[]): Query<T>;
 >array : T[]
 
 function from<T>(enumerator: Enumerator<T>): Query<T>;
->from : { <T_1>(array: T_1[]): Query<T_1>; <T_2>(enumerator: Enumerator<T>): Query<T>; }
+>from : { <T_1>(array: T_1[]): Query<T_1>; <T>(enumerator: Enumerator<T>): Query<T>; }
 >enumerator : Enumerator<T>
 
 function from(arg: any): any {
diff --git a/tests/baselines/reference/instantiationExpressions.types b/tests/baselines/reference/instantiationExpressions.types
index 11410cfb0f22b..33c9224acc42b 100644
--- a/tests/baselines/reference/instantiationExpressions.types
+++ b/tests/baselines/reference/instantiationExpressions.types
@@ -6,12 +6,12 @@ declare function fx<T>(x: T): T;
 >x : T
 
 declare function fx<T>(x: T, n: number): T;
->fx : { <T_1>(x: T_1): T_1; <T_2>(x: T, n: number): T; <T_3, U>(t: [T_3, U]): [T_3, U]; }
+>fx : { <T_1>(x: T_1): T_1; <T>(x: T, n: number): T; <T_2, U>(t: [T_2, U]): [T_2, U]; }
 >x : T
 >n : number
 
 declare function fx<T, U>(t: [T, U]): [T, U];
->fx : { <T_1>(x: T_1): T_1; <T_2>(x: T_2, n: number): T_2; <T_3, U>(t: [T, U]): [T, U]; }
+>fx : { <T_1>(x: T_1): T_1; <T_2>(x: T_2, n: number): T_2; <T, U>(t: [T, U]): [T, U]; }
 >t : [T, U]
 
 function f1() {
@@ -419,16 +419,16 @@ function f37(f: (<T>(a: T) => T) | (new (a: string, b: number) => string[])) {
 }
 
 function f38<T extends (<A>(x: A) => A) | (<B>(x: B) => B[]), U>(f: T | U | (<C>(x: C) => C[][])) {
->f38 : <T extends (<A_1>(x: A_1) => A_1) | (<B>(x: B) => B[]), U>(f: T | U | (<C_1>(x: C_1) => C_1[][])) => void
+>f38 : <T extends (<A>(x: A) => A) | (<B>(x: B) => B[]), U>(f: T | U | (<C>(x: C) => C[][])) => void
 >x : A
 >x : B
->f : T | U | (<C_1>(x: C_1) => C_1[][])
+>f : T | U | (<C>(x: C) => C[][])
 >x : C
 
     let fs = f<string>;  // U | ((x: string) => string) | ((x: string) => string[]) | ((x: string) => string[][])
 >fs : U | ((x: string) => string) | ((x: string) => string[]) | ((x: string) => string[][])
 >f<string> : U | ((x: string) => string) | ((x: string) => string[]) | ((x: string) => string[][])
->f : T | U | (<C_1>(x: C_1) => C_1[][])
+>f : T | U | (<C>(x: C) => C[][])
 }
 
 function makeBox<T>(value: T) {
@@ -459,7 +459,7 @@ type A<U> = InstanceType<typeof Array<U>>;  // U[]
 >Array : ArrayConstructor
 
 declare const g1: {
->g1 : { <T>(a: T): { a: T; }; new <U>(b: U): { b: U; }; }
+>g1 : { <T>(a: T): {    a: T;}; new <U>(b: U): {    b: U;}; }
 
     <T>(a: T): { a: T };
 >a : T
diff --git a/tests/baselines/reference/intersectionTypeInference1.types b/tests/baselines/reference/intersectionTypeInference1.types
index 216e5c238e689..096be34a8b5e8 100644
--- a/tests/baselines/reference/intersectionTypeInference1.types
+++ b/tests/baselines/reference/intersectionTypeInference1.types
@@ -19,8 +19,8 @@ const parameterFn = (props:{store:string}) => alert(props.store)
 >store : string
 
 const brokenFunction = <OwnProps>(f: (p: {dispatch: number} & OwnProps) => void) => (o: OwnProps) => o
->brokenFunction : <OwnProps>(f: (p: { dispatch: number; } & OwnProps) => void) => (o: OwnProps) => OwnProps
-><OwnProps>(f: (p: {dispatch: number} & OwnProps) => void) => (o: OwnProps) => o : <OwnProps>(f: (p: { dispatch: number; } & OwnProps) => void) => (o: OwnProps) => OwnProps
+>brokenFunction : <OwnProps>(f: (p: {    dispatch: number;} & OwnProps) => void) => (o: OwnProps) => OwnProps
+><OwnProps>(f: (p: {dispatch: number} & OwnProps) => void) => (o: OwnProps) => o : <OwnProps>(f: (p: {    dispatch: number;} & OwnProps) => void) => (o: OwnProps) => OwnProps
 >f : (p: {    dispatch: number;} & OwnProps) => void
 >p : { dispatch: number; } & OwnProps
 >dispatch : number
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index ff92db3c4eddf..9a3eaf5bad288 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -15,7 +15,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => IPromise<U_2>, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => IPromise<U>
 >value : T
 >error : (error: any) => U
@@ -26,7 +26,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => IPromise<U>
@@ -37,7 +37,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
diff --git a/tests/baselines/reference/ipromise3.types b/tests/baselines/reference/ipromise3.types
index 9e89b5f24fb03..1971000bd01ff 100644
--- a/tests/baselines/reference/ipromise3.types
+++ b/tests/baselines/reference/ipromise3.types
@@ -12,7 +12,7 @@ interface IPromise3<T> {
 >progress : any
 
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
->then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U_2>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise3<U_3>, progress?: (progress: any) => void): IPromise3<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise3<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => IPromise3<U_2>, progress?: (progress: any) => void): IPromise3<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise3<U_3>; }
 >success : (value: T) => IPromise3<U>
 >value : T
 >error : (error: any) => U
@@ -21,7 +21,7 @@ interface IPromise3<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
->then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U_2>(success?: (value: T) => IPromise3<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise3<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise3<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U_2>(success?: (value: T) => IPromise3<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise3<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void): IPromise3<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise3<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => IPromise3<U>
@@ -30,7 +30,7 @@ interface IPromise3<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
->then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U_2>(success?: (value: T) => IPromise3<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise3<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise3<U_3>, progress?: (progress: any) => void): IPromise3<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
+>then : { <U_1>(success?: (value: T) => IPromise3<U_1>, error?: (error: any) => IPromise3<U_1>, progress?: (progress: any) => void): IPromise3<U_1>; <U_2>(success?: (value: T) => IPromise3<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise3<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise3<U_3>, progress?: (progress: any) => void): IPromise3<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise3<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index 332c250b6e7fd..2dfd786588dbb 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -15,7 +15,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => IPromise<U_2>, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => IPromise<U>
 >value : T
 >error : (error: any) => U
@@ -26,7 +26,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => IPromise<U>
@@ -37,7 +37,7 @@ declare module Windows.Foundation {
 >Foundation : any
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
diff --git a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
index 38da8a8daca45..9581f9d403a8d 100644
--- a/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
+++ b/tests/baselines/reference/isDeclarationVisibleNodeKinds.types
@@ -6,7 +6,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator1(schema: any): <T>(data: T) => T {
->createValidator1 : (schema: any) => <T_1>(data: T_1) => T_1
+>createValidator1 : (schema: any) => <T>(data: T) => T
 >schema : any
 >data : T
 
@@ -20,7 +20,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator2(schema: any): new <T>(data: T) => T {
->createValidator2 : (schema: any) => new <T_1>(data: T_1) => T_1
+>createValidator2 : (schema: any) => new <T>(data: T) => T
 >schema : any
 >data : T
 
@@ -34,7 +34,7 @@ module schema {
 >schema : typeof schema
 
      export function createValidator3(schema: any): number | { new <T>(data: T): T; }  {
->createValidator3 : (schema: any) => number | (new <T_1>(data: T_1) => T_1)
+>createValidator3 : (schema: any) => number | (new <T>(data: T) => T)
 >schema : any
 >data : T
 
@@ -48,7 +48,7 @@ module schema {
 >schema : typeof schema
 
      export function createValidator4(schema: any): { new <T>(data: T): T; }[] {
->createValidator4 : (schema: any) => (new <T_1>(data: T_1) => T_1)[]
+>createValidator4 : (schema: any) => (new <T>(data: T) => T)[]
 >schema : any
 >data : T
 
@@ -63,7 +63,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator5(schema: any): { new <T>(data: T): T } {
->createValidator5 : (schema: any) => new <T_1>(data: T_1) => T_1
+>createValidator5 : (schema: any) => new <T>(data: T) => T
 >schema : any
 >data : T
 
@@ -77,7 +77,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator6(schema: any): [ new <T>(data: T) => T, number] {
->createValidator6 : (schema: any) => [new <T_1>(data: T_1) => T_1, number]
+>createValidator6 : (schema: any) => [new <T>(data: T) => T, number]
 >schema : any
 >data : T
 
@@ -91,7 +91,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator7(schema: any): (new <T>(data: T)=>T )[] {
->createValidator7 : (schema: any) => (new <T_1>(data: T_1) => T_1)[]
+>createValidator7 : (schema: any) => (new <T>(data: T) => T)[]
 >schema : any
 >data : T
 
@@ -105,7 +105,7 @@ module schema {
 >schema : typeof schema
 
     export function createValidator8(schema: any): Array<{ <T>(data: T) : T}> {
->createValidator8 : (schema: any) => (<T_1>(data: T_1) => T_1)[]
+>createValidator8 : (schema: any) => (<T>(data: T) => T)[]
 >schema : any
 >data : T
 
@@ -122,7 +122,7 @@ module schema {
 >T : T
 
         get createValidator9(): <T>(data: T) => T {
->createValidator9 : <T_1>(data: T_1) => T_1
+>createValidator9 : <T>(data: T) => T
 >data : T
 
             return undefined;
@@ -130,8 +130,8 @@ module schema {
         }
         
         set createValidator10(v: <T>(data: T) => T) {
->createValidator10 : <T_1>(data: T_1) => T_1
->v : <T_1>(data: T_1) => T_1
+>createValidator10 : <T>(data: T) => T
+>v : <T>(data: T) => T
 >data : T
         }
     }
diff --git a/tests/baselines/reference/jsDeclarationsClasses.js b/tests/baselines/reference/jsDeclarationsClasses.js
index d2df8ba6729a1..9444df18fd335 100644
--- a/tests/baselines/reference/jsDeclarationsClasses.js
+++ b/tests/baselines/reference/jsDeclarationsClasses.js
@@ -541,7 +541,7 @@ export class F<T, U> {
      * @param {A} a
      * @param {B} b
      */
-    static create<A_1, B_1>(a: A_1, b: B_1): F<A_1, B_1>;
+    static create<A, B>(a: A, b: B): F<A, B>;
     /**
      * @param {T} a
      * @param {U} b
diff --git a/tests/baselines/reference/jsDeclarationsInterfaces.js b/tests/baselines/reference/jsDeclarationsInterfaces.js
index f327cfee537f2..707b8eac1aee9 100644
--- a/tests/baselines/reference/jsDeclarationsInterfaces.js
+++ b/tests/baselines/reference/jsDeclarationsInterfaces.js
@@ -134,19 +134,19 @@ export interface A {
 export interface B {
     cat: string;
 }
-export interface C<T_1, U_1> {
+export interface C<T, U> {
     new (): string;
-    new (x: T_1): U_1;
-    new <Q_4>(x: Q_4): T_1 & Q_4;
+    new (x: T): U;
+    new <Q_3>(x: Q_3): T & Q_3;
     (): number;
-    (x: T_1): U_1;
-    <Q_3>(x: Q_3): T_1 & Q_3;
-    field: T_1 & U_1;
-    optionalField?: T_1;
-    readonly readonlyField: T_1 & U_1;
-    readonly readonlyOptionalField?: U_1;
-    method<Q_1 = number>(): number;
-    method<Q_2>(a: T_1 & Q_2): Q_2 & number;
+    (x: T): U;
+    <Q_2>(x: Q_2): T & Q_2;
+    field: T & U;
+    optionalField?: T;
+    readonly readonlyField: T & U;
+    readonly readonlyOptionalField?: U;
+    method<Q = number>(): number;
+    method<Q_1>(a: T & Q_1): Q_1 & number;
     method(a?: number): number;
     method(...args: any[]): number;
     optMethod?(): number;
@@ -161,11 +161,11 @@ export interface K extends I, J {
 export interface L extends K {
     y: string;
 }
-export interface M<T_1> {
-    field: T_1;
+export interface M<T> {
+    field: T;
 }
-export interface N<U_1> extends M<U_1> {
-    other: U_1;
+export interface N<U> extends M<U> {
+    other: U;
 }
 export interface O {
     [idx: string]: string;
diff --git a/tests/baselines/reference/jsDeclarationsInterfaces.types b/tests/baselines/reference/jsDeclarationsInterfaces.types
index 31be3a1660dda..2f93c0f6aa320 100644
--- a/tests/baselines/reference/jsDeclarationsInterfaces.types
+++ b/tests/baselines/reference/jsDeclarationsInterfaces.types
@@ -42,15 +42,15 @@ export interface C<T, U> {
 >method : { <Q = number>(): number; <Q_1>(a: T & Q_1): Q_1 & number; (a?: number): number; (...args: any[]): number; }
 
     method<Q>(a: T & Q): Q & number;
->method : { <Q_1 = number>(): number; <Q_2>(a: T & Q): Q & number; (a?: number): number; (...args: any[]): number; }
+>method : { <Q_1 = number>(): number; <Q>(a: T & Q): Q & number; (a?: number): number; (...args: any[]): number; }
 >a : T & Q
 
     method(a?: number): number;
->method : { <Q_1 = number>(): number; <Q_2>(a: T & Q_2): Q_2 & number; (a?: number): number; (...args: any[]): number; }
+>method : { <Q = number>(): number; <Q_1>(a: T & Q_1): Q_1 & number; (a?: number): number; (...args: any[]): number; }
 >a : number
 
     method(...args: any[]): number;
->method : { <Q_1 = number>(): number; <Q_2>(a: T & Q_2): Q_2 & number; (a?: number): number; (...args: any[]): number; }
+>method : { <Q = number>(): number; <Q_1>(a: T & Q_1): Q_1 & number; (a?: number): number; (...args: any[]): number; }
 >args : any[]
 
     optMethod?(): number;
diff --git a/tests/baselines/reference/jsxExcessPropsAndAssignability.types b/tests/baselines/reference/jsxExcessPropsAndAssignability.types
index 1469e837a8ed6..f1e19342f97ee 100644
--- a/tests/baselines/reference/jsxExcessPropsAndAssignability.types
+++ b/tests/baselines/reference/jsxExcessPropsAndAssignability.types
@@ -7,8 +7,8 @@ import * as React from 'react';
 >React : typeof React
 
 const myHoc = <ComposedComponentProps extends any>(
->myHoc : <ComposedComponentProps extends unknown>(ComposedComponent: React.ComponentClass<ComposedComponentProps, any>) => void
-><ComposedComponentProps extends any>(    ComposedComponent: React.ComponentClass<ComposedComponentProps>,) => {    type WrapperComponentProps = ComposedComponentProps & { myProp: string };    const WrapperComponent: React.ComponentClass<WrapperComponentProps> = null as any;    const props: ComposedComponentProps = null as any;    <WrapperComponent {...props} myProp={'1000000'} />;    <WrapperComponent {...props} myProp={1000000} />;} : <ComposedComponentProps extends unknown>(ComposedComponent: React.ComponentClass<ComposedComponentProps, any>) => void
+>myHoc : <ComposedComponentProps extends unknown>(ComposedComponent: React.ComponentClass<ComposedComponentProps>) => void
+><ComposedComponentProps extends any>(    ComposedComponent: React.ComponentClass<ComposedComponentProps>,) => {    type WrapperComponentProps = ComposedComponentProps & { myProp: string };    const WrapperComponent: React.ComponentClass<WrapperComponentProps> = null as any;    const props: ComposedComponentProps = null as any;    <WrapperComponent {...props} myProp={'1000000'} />;    <WrapperComponent {...props} myProp={1000000} />;} : <ComposedComponentProps extends unknown>(ComposedComponent: React.ComponentClass<ComposedComponentProps>) => void
 
     ComposedComponent: React.ComponentClass<ComposedComponentProps>,
 >ComposedComponent : React.ComponentClass<ComposedComponentProps, any>
diff --git a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types b/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
index 3ee7e5d05f785..37434455083d0 100644
--- a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
+++ b/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
@@ -11,7 +11,7 @@ declare function omit<T, K extends string>(names: readonly K[], obj: T): Omit<T,
 >obj : T
 
 declare function omit<K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>;
->omit : { <T, K_1 extends string>(names: readonly K_1[], obj: T): Omit<T, K_1>; <K_2 extends string>(names: readonly K[]): <T_1>(obj: T_1) => Omit<T_1, K>; }
+>omit : { <T, K_1 extends string>(names: readonly K_1[], obj: T): Omit<T, K_1>; <K extends string>(names: readonly K[]): <T_1>(obj: T_1) => Omit<T_1, K>; }
 >names : readonly K[]
 >obj : T
 
diff --git a/tests/baselines/reference/keyofAndIndexedAccess.types b/tests/baselines/reference/keyofAndIndexedAccess.types
index 21a20a2e4ff51..d1aca03181660 100644
--- a/tests/baselines/reference/keyofAndIndexedAccess.types
+++ b/tests/baselines/reference/keyofAndIndexedAccess.types
@@ -765,8 +765,8 @@ function f60<T>(source: T, target: T) {
 }
 
 function f70(func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) {
->f70 : (func: <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void) => void
->func : <T, U>(k1: keyof T & keyof U, k2: keyof T | keyof U) => void
+>f70 : (func: <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void) => void
+>func : <T, U>(k1: keyof (T | U), k2: keyof (T & U)) => void
 >k1 : keyof T & keyof U
 >k2 : keyof T | keyof U
 
@@ -1406,13 +1406,13 @@ function path<T, K1 extends keyof T>(obj: T, key1: K1): T[K1];
 >key1 : K1
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2];
->path : { <T_1, K1_1 extends keyof T_1>(obj: T_1, key1: K1_1): T_1[K1_1]; <T_2, K1_2 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T_3, K1_3 extends keyof T_3, K2_1 extends keyof T_3[K1_3], K3 extends keyof T_3[K1_3][K2_1]>(obj: T_3, key1: K1_3, key2: K2_1, key3: K3): T_3[K1_3][K2_1][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>path : { <T_1, K1_1 extends keyof T_1>(obj: T_1, key1: K1_1): T_1[K1_1]; <T, K1 extends keyof T, K2 extends keyof T[K1]>(obj: T, key1: K1, key2: K2): T[K1][K2]; <T_2, K1_2 extends keyof T_2, K2_1 extends keyof T_2[K1_2], K3 extends keyof T_2[K1_2][K2_1]>(obj: T_2, key1: K1_2, key2: K2_1, key3: K3): T_2[K1_2][K2_1][K3]; (obj: any, ...keys: (string | number)[]): any; }
 >obj : T
 >key1 : K1
 >key2 : K2
 
 function path<T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3];
->path : { <T_1, K1_1 extends keyof T_1>(obj: T_1, key1: K1_1): T_1[K1_1]; <T_2, K1_2 extends keyof T_2, K2_1 extends keyof T_2[K1_2]>(obj: T_2, key1: K1_2, key2: K2_1): T_2[K1_2][K2_1]; <T_3, K1_3 extends keyof T, K2_2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
+>path : { <T_1, K1_1 extends keyof T_1>(obj: T_1, key1: K1_1): T_1[K1_1]; <T_2, K1_2 extends keyof T_2, K2_1 extends keyof T_2[K1_2]>(obj: T_2, key1: K1_2, key2: K2_1): T_2[K1_2][K2_1]; <T, K1 extends keyof T, K2 extends keyof T[K1], K3 extends keyof T[K1][K2]>(obj: T, key1: K1, key2: K2, key3: K3): T[K1][K2][K3]; (obj: any, ...keys: (string | number)[]): any; }
 >obj : T
 >key1 : K1
 >key2 : K2
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads.types b/tests/baselines/reference/methodSignaturesWithOverloads.types
index 90f0eaead1582..c216519d3a4bf 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads.types
@@ -34,7 +34,7 @@ var c2: {
 >x : T
 
     func4? <T>(s: T): string; // error, mismatched optionality
->func4 : { <T_1>(x: T_1): number; <T_2>(s: T): string; }
+>func4 : { <T_1>(x: T_1): number; <T>(s: T): string; }
 >s : T
 
     func5?: {
diff --git a/tests/baselines/reference/methodSignaturesWithOverloads2.types b/tests/baselines/reference/methodSignaturesWithOverloads2.types
index 5db07de7f1412..2dead056a2c0a 100644
--- a/tests/baselines/reference/methodSignaturesWithOverloads2.types
+++ b/tests/baselines/reference/methodSignaturesWithOverloads2.types
@@ -54,7 +54,7 @@ var c2: {
 >x : T
 
     func4? <T>(s: T): string;
->func4 : { <T_1>(x: T_1): number; <T_2>(s: T): string; }
+>func4 : { <T_1>(x: T_1): number; <T>(s: T): string; }
 >s : T
 
     func5?: {
diff --git a/tests/baselines/reference/missingTypeArguments3.types b/tests/baselines/reference/missingTypeArguments3.types
index 38a989e8598f2..ca13db8148d37 100644
--- a/tests/baselines/reference/missingTypeArguments3.types
+++ b/tests/baselines/reference/missingTypeArguments3.types
@@ -14,7 +14,7 @@ declare module linq {
 >element : T
 
         GroupBy<TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>;
->GroupBy : { <TKey_1>(keySelector: (element: T) => TKey_1): Enumerable<Grouping<TKey_1, T>>; <TKey_2, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>; }
+>GroupBy : { <TKey_1>(keySelector: (element: T) => TKey_1): Enumerable<Grouping<TKey_1, T>>; <TKey, TElement>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TElement): Enumerable<Grouping<TKey, TElement>>; }
 >keySelector : (element: T) => TKey
 >element : T
 >elementSelector : (element: T) => TElement
diff --git a/tests/baselines/reference/mixinClassesAnnotated.types b/tests/baselines/reference/mixinClassesAnnotated.types
index 9126092a44476..4f84de5a7fa25 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.types
+++ b/tests/baselines/reference/mixinClassesAnnotated.types
@@ -36,8 +36,8 @@ interface Printable {
 }
 
 const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>
->Printable : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
-><T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>    class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & { message: string; } & T
+>Printable : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & {    message: string;} & T
+><T extends Constructor<Base>>(superClass: T): Constructor<Printable> & { message: string } & T =>    class extends superClass {        static message = "hello";        print() {            const output = this.x + "," + this.y;        }    } : <T extends Constructor<Base>>(superClass: T) => Constructor<Printable> & {    message: string;} & T
 >superClass : T
 >message : string
 
diff --git a/tests/baselines/reference/multipleInferenceContexts.types b/tests/baselines/reference/multipleInferenceContexts.types
index e017122005564..30434ef960b49 100644
--- a/tests/baselines/reference/multipleInferenceContexts.types
+++ b/tests/baselines/reference/multipleInferenceContexts.types
@@ -22,7 +22,7 @@ interface Instance<Data> {
 }
 
 declare var Moon: {
->Moon : <Data>(options?: ConstructorOptions<Data> | undefined) => Instance<Data>
+>Moon : <Data>(options?: ConstructorOptions<Data>) => Instance<Data>
 
     <Data>(options?: ConstructorOptions<Data>): Instance<Data>;
 >options : ConstructorOptions<Data> | undefined
diff --git a/tests/baselines/reference/nearbyIdenticalGenericLambdasAssignable.types b/tests/baselines/reference/nearbyIdenticalGenericLambdasAssignable.types
index 701903f38cfc4..f4b4b02016d9e 100644
--- a/tests/baselines/reference/nearbyIdenticalGenericLambdasAssignable.types
+++ b/tests/baselines/reference/nearbyIdenticalGenericLambdasAssignable.types
@@ -2,7 +2,7 @@
 
 === nearbyIdenticalGenericLambdasAssignable.ts ===
 declare const fA: <T>() => { v: T };
->fA : <T>() => { v: T; }
+>fA : <T>() => {    v: T;}
 >v : T
 
 const fB = <T>() => {
@@ -43,7 +43,7 @@ type TC = typeof fC;
 >fC : <T>() => { v: T; }
 
 type TL = <T>() => { v: T }; 
->TL : <T>() => { v: T; }
+>TL : <T>() => {    v: T;}
 >v : T
 
 declare function accA(x: TA): void;
diff --git a/tests/baselines/reference/noImplicitReturnsExclusions.types b/tests/baselines/reference/noImplicitReturnsExclusions.types
index 1547993dbfa13..9ee2be8951683 100644
--- a/tests/baselines/reference/noImplicitReturnsExclusions.types
+++ b/tests/baselines/reference/noImplicitReturnsExclusions.types
@@ -159,7 +159,7 @@ interface Thenable<T> {
 
   ): Thenable<TResult>;
   then<TResult>(
->then : { <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => TResult_1 | Thenable<TResult_1>) | undefined): Thenable<TResult_1>; <TResult_2>(onfulfilled?: ((value: T) => TResult | Thenable<TResult>) | undefined, onrejected?: ((reason: any) => void) | undefined): Thenable<TResult>; }
+>then : { <TResult_1>(onfulfilled?: ((value: T) => TResult_1 | Thenable<TResult_1>) | undefined, onrejected?: ((reason: any) => TResult_1 | Thenable<TResult_1>) | undefined): Thenable<TResult_1>; <TResult>(onfulfilled?: ((value: T) => TResult | Thenable<TResult>) | undefined, onrejected?: ((reason: any) => void) | undefined): Thenable<TResult>; }
 
     onfulfilled?: (value: T) => TResult | Thenable<TResult>,
 >onfulfilled : ((value: T) => TResult | Thenable<TResult>) | undefined
diff --git a/tests/baselines/reference/nodeModuleReexportFromDottedPath.types b/tests/baselines/reference/nodeModuleReexportFromDottedPath.types
index ad3363dc2b126..34f6e20889611 100644
--- a/tests/baselines/reference/nodeModuleReexportFromDottedPath.types
+++ b/tests/baselines/reference/nodeModuleReexportFromDottedPath.types
@@ -22,7 +22,7 @@ import { PrismaClient } from "@prisma/client";
 >PrismaClient : typeof PrismaClient
 
 declare const enhancePrisma: <TPrismaClientCtor>(client: TPrismaClientCtor) => TPrismaClientCtor & { enhanced: unknown };
->enhancePrisma : <TPrismaClientCtor>(client: TPrismaClientCtor) => TPrismaClientCtor & { enhanced: unknown; }
+>enhancePrisma : <TPrismaClientCtor>(client: TPrismaClientCtor) => TPrismaClientCtor & {    enhanced: unknown;}
 >client : TPrismaClientCtor
 >enhanced : unknown
 
diff --git a/tests/baselines/reference/nonInferrableTypePropagation2.types b/tests/baselines/reference/nonInferrableTypePropagation2.types
index a8eda79ab8380..a878f1f4d97da 100644
--- a/tests/baselines/reference/nonInferrableTypePropagation2.types
+++ b/tests/baselines/reference/nonInferrableTypePropagation2.types
@@ -31,7 +31,7 @@ interface Refinement<A, B extends A> {
 }
 
 declare const filter: {
->filter : { <A, B extends A>(refinement: Refinement<A, B>): (as: readonly A[]) => readonly B[]; <A_1>(predicate: Predicate<A_1>): <B_1 extends A_1>(bs: readonly B_1[]) => readonly B_1[]; <A_2>(predicate: Predicate<A_2>): (as: readonly A_2[]) => readonly A_2[]; }
+>filter : { <A, B extends A>(refinement: Refinement<A, B>): (as: ReadonlyArray<A>) => ReadonlyArray<B>; <A_1>(predicate: Predicate<A_1>): <B_1 extends A_1>(bs: readonly B_1[]) => readonly B_1[]; <A_2>(predicate: Predicate<A_2>): (as: readonly A_2[]) => readonly A_2[]; }
 
     <A, B extends A>(refinement: Refinement<A, B>): (as: ReadonlyArray<A>) => ReadonlyArray<B>
 >refinement : Refinement<A, B>
diff --git a/tests/baselines/reference/objectLiteralParameterResolution.types b/tests/baselines/reference/objectLiteralParameterResolution.types
index 16ee9499a694f..6ac06af5c299e 100644
--- a/tests/baselines/reference/objectLiteralParameterResolution.types
+++ b/tests/baselines/reference/objectLiteralParameterResolution.types
@@ -8,7 +8,7 @@ interface Foo{
 >objs : any[]
 
     extend<T>(deep: boolean, target: T, ...objs: any[]): T;
->extend : { <T_1>(target: T_1, ...objs: any[]): T_1; <T_2>(deep: boolean, target: T, ...objs: any[]): T; }
+>extend : { <T_1>(target: T_1, ...objs: any[]): T_1; <T>(deep: boolean, target: T, ...objs: any[]): T; }
 >deep : boolean
 >target : T
 >objs : any[]
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
index 2dcd983f62a0e..c045e076d973f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
@@ -40,13 +40,13 @@ interface I2 {
 }
 
 var a: { foo<Z, A, B, C, D>(x: Z): Z }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 >foo : <Z, A, B, C, D>(x: Z) => Z
 >x : Z
 
 var b = { foo<A, B, C, D, E, F>(x: A) { return x; } };
->b : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
->{ foo<A, B, C, D, E, F>(x: A) { return x; } } : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
+>b : { foo<A, B, C, D, E, F>(x: A): A; }
+>{ foo<A, B, C, D, E, F>(x: A) { return x; } } : { foo<A, B, C, D, E, F>(x: A): A; }
 >foo : <A, B, C, D, E, F>(x: A) => A
 >x : A
 >x : A
@@ -100,31 +100,31 @@ function foo2(x: any) { }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: typeof a): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
->x : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>foo3 : { (x: typeof a): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>x : { foo<Z, A, B, C, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; (x: typeof a): any; }
->x : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: typeof a): any; }
+>x : { foo<Z, A, B, C, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: typeof b): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
->x : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
->b : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
+>foo4 : { (x: typeof b): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
+>x : { foo<A, B, C, D, E, F>(x: A): A; }
+>b : { foo<A, B, C, D, E, F>(x: A): A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; (x: typeof b): any; }
->x : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
->b : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
+>foo4 : { (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; (x: typeof b): any; }
+>x : { foo<A, B, C, D, E, F>(x: A): A; }
+>b : { foo<A, B, C, D, E, F>(x: A): A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
+>foo4 : { (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
 function foo5(x: A);
@@ -164,16 +164,16 @@ function foo6(x: any) { }
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : A
 
 function foo7(x: typeof a); // no error, bug?
 >foo7 : { (x: A): any; (x: typeof a): any; }
->x : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>x : { foo<Z, A, B, C, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo8(x: B<string, string>);
@@ -201,29 +201,29 @@ function foo9(x: any) { }
 >x : any
 
 function foo10(x: B<string, boolean>);
->foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : B<string, boolean>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: typeof a): any; }
->x : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>x : { foo<Z, A, B, C, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo11(x: B<string, boolean>);
->foo11 : { (x: B<string, boolean>): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
+>foo11 : { (x: B<string, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : B<string, boolean>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: typeof b): any; }
->x : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
->b : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
+>x : { foo<A, B, C, D, E, F>(x: A): A; }
+>b : { foo<A, B, C, D, E, F>(x: A): A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, boolean>): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
+>foo11 : { (x: B<string, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
 function foo12(x: I<B<string, number>, number, Date, string>);
@@ -251,29 +251,29 @@ function foo12b(x: any) { }
 >x : any
 
 function foo13(x: I<string, Date, RegExp, Date>);
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : I<string, Date, RegExp, Date>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: typeof a): any; }
->x : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
->a : { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }
+>x : { foo<Z, A, B, C, D>(x: Z): Z; }
+>a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A_1, B_1, C_1, D>(x: Z): Z; }): any; }
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo14(x: I<string, Date, RegExp, boolean>);
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : I<string, Date, RegExp, boolean>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: typeof b): any; }
->x : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
->b : { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }
+>x : { foo<A, B, C, D, E, F>(x: A): A; }
+>b : { foo<A, B, C, D, E, F>(x: A): A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A_1, B_1, C_1, D, E, F>(x: A_1): A_1; }): any; }
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
 function foo15(x: I2);
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
index 71e4b96912eef..cb54b27ab74fc 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
@@ -45,8 +45,8 @@ var a: { foo<Z>(x: Z): Z }
 >x : Z
 
 var b = { foo<A>(x: A) { return x; } };
->b : { foo<A_1>(x: A_1): A_1; }
->{ foo<A>(x: A) { return x; } } : { foo<A_1>(x: A_1): A_1; }
+>b : { foo<A>(x: A): A; }
+>{ foo<A>(x: A) { return x; } } : { foo<A>(x: A): A; }
 >foo : <A>(x: A) => A
 >x : A
 >x : A
@@ -114,17 +114,17 @@ function foo3(x: any) { }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: typeof b): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
->x : { foo<A_1>(x: A_1): A_1; }
->b : { foo<A_1>(x: A_1): A_1; }
+>foo4 : { (x: typeof b): any; (x: { foo<A>(x: A): A; }): any; }
+>x : { foo<A>(x: A): A; }
+>b : { foo<A>(x: A): A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo<A_1>(x: A_1): A_1; }): any; (x: typeof b): any; }
->x : { foo<A_1>(x: A_1): A_1; }
->b : { foo<A_1>(x: A_1): A_1; }
+>foo4 : { (x: { foo<A>(x: A): A; }): any; (x: typeof b): any; }
+>x : { foo<A>(x: A): A; }
+>b : { foo<A>(x: A): A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo<A_1>(x: A_1): A_1; }): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
+>foo4 : { (x: { foo<A>(x: A): A; }): any; (x: { foo<A>(x: A): A; }): any; }
 >x : any
 
 function foo5(x: A);
@@ -214,16 +214,16 @@ function foo10(x: any) { }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
+>foo11 : { (x: B<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : B<string>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: typeof b): any; }
->x : { foo<A_1>(x: A_1): A_1; }
->b : { foo<A_1>(x: A_1): A_1; }
+>x : { foo<A>(x: A): A; }
+>b : { foo<A>(x: A): A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
+>foo11 : { (x: B<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : any
 
 function foo12(x: I<string>);
@@ -264,16 +264,16 @@ function foo13(x: any) { }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
+>foo14 : { (x: I<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : I<string>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: typeof b): any; }
->x : { foo<A_1>(x: A_1): A_1; }
->b : { foo<A_1>(x: A_1): A_1; }
+>x : { foo<A>(x: A): A; }
+>b : { foo<A>(x: A): A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { foo<A_1>(x: A_1): A_1; }): any; }
+>foo14 : { (x: I<string>): any; (x: { foo<A>(x: A): A; }): any; }
 >x : any
 
 function foo15(x: I2);
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
index ff0245a6f9fa7..477e469cc1482 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
@@ -28,12 +28,12 @@ interface I2 {
 }
 
 var a: { new <Z, A, B, CC, D>(x: Z): C<Z, A, B>; }
->a : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
+>a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
 >x : Z
 
 var b = { new<A, B, C, D, E, F>(x: A) { return x; } };
->b : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
->{ new<A, B, C, D, E, F>(x: A) { return x; } } : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
+>b : { "new"<A, B, C, D, E, F>(x: A): A; }
+>{ new<A, B, C, D, E, F>(x: A) { return x; } } : { "new"<A, B, C, D, E, F>(x: A): A; }
 >new : <A, B, C, D, E, F>(x: A) => A
 >x : A
 >x : A
@@ -75,31 +75,31 @@ function foo2(x: any) { }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: typeof a): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
->x : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
->a : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
+>foo3 : { (x: typeof a): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>x : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
+>a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; (x: typeof a): any; }
->x : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
->a : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
+>foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: typeof a): any; }
+>x : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
+>a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
 
 function foo3(x: any) { }
->foo3 : { (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
+>foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: typeof b): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
->x : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
->b : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
+>foo4 : { (x: typeof b): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
+>x : { "new"<A, B, C, D, E, F>(x: A): A; }
+>b : { "new"<A, B, C, D, E, F>(x: A): A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; (x: typeof b): any; }
->x : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
->b : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
+>foo4 : { (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; (x: typeof b): any; }
+>x : { "new"<A, B, C, D, E, F>(x: A): A; }
+>b : { "new"<A, B, C, D, E, F>(x: A): A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
+>foo4 : { (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
 function foo8(x: B<string, string>);
@@ -127,29 +127,29 @@ function foo9(x: any) { }
 >x : any
 
 function foo10(x: B<string, boolean>);
->foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
+>foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : B<string, boolean>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: typeof a): any; }
->x : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
->a : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
+>x : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
+>a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
+>foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo11(x: B<string, boolean>);
->foo11 : { (x: B<string, boolean>): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
+>foo11 : { (x: B<string, boolean>): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : B<string, boolean>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: typeof b): any; }
->x : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
->b : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
+>x : { "new"<A, B, C, D, E, F>(x: A): A; }
+>b : { "new"<A, B, C, D, E, F>(x: A): A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, boolean>): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
+>foo11 : { (x: B<string, boolean>): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
 function foo12(x: I<B<string, number>, number, Date, string>);
@@ -177,28 +177,28 @@ function foo12b(x: any) { }
 >x : any
 
 function foo13(x: I<string, Date, RegExp, Date>);
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : I<string, Date, RegExp, Date>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: typeof a): any; }
->x : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
->a : new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>
+>x : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
+>a : new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B_1, CC, D>(x: Z) => C<Z, A, B_1>): any; }
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo14(x: I<string, Date, RegExp, boolean>);
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : I<string, Date, RegExp, boolean>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: typeof b): any; }
->x : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
->b : { "new"<A, B_1, C_1, D, E, F>(x: A): A; }
+>x : { "new"<A, B, C, D, E, F>(x: A): A; }
+>b : { "new"<A, B, C, D, E, F>(x: A): A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { "new"<A, B_1, C_1, D, E, F>(x: A): A; }): any; }
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { "new"<A, B, C, D, E, F>(x: A): A; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/optionalParameterRetainsNull.types b/tests/baselines/reference/optionalParameterRetainsNull.types
index ae9f3a4a3a11e..f64a90d213c1a 100644
--- a/tests/baselines/reference/optionalParameterRetainsNull.types
+++ b/tests/baselines/reference/optionalParameterRetainsNull.types
@@ -6,8 +6,8 @@ interface Bar {  bar: number; foo: object | null;  }
 >foo : object | null
 
 let a = {
->a : { test<K extends keyof Bar>(a: K, b?: Bar[K] | null | undefined): void; }
->{  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }} : { test<K extends keyof Bar>(a: K, b?: Bar[K] | null | undefined): void; }
+>a : { test<K extends keyof Bar>(a: K, b?: Bar[K] | null): void; }
+>{  test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }} : { test<K extends keyof Bar>(a: K, b?: Bar[K] | null): void; }
 
   test<K extends keyof Bar> (a: K,  b?: Bar[K]  |  null)  { }
 >test : <K extends keyof Bar>(a: K, b?: Bar[K] | null) => void
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.types b/tests/baselines/reference/overloadEquivalenceWithStatics.types
index 2afd40c7ebe65..47a35333f0de0 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.types
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.types
@@ -9,7 +9,7 @@ static B<S>(v: A1<S>): A1<S>; // 1
 >v : A1<S>
 
 static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
->B : { <S_1>(v: A1<S_1>): A1<S_1>; <S_2>(v: S): A1<S>; }
+>B : { <S_1>(v: A1<S_1>): A1<S_1>; <S>(v: S): A1<S>; }
 >v : S
 
 static B<S>(v: any): A1<S> {
diff --git a/tests/baselines/reference/overloadResolution.types b/tests/baselines/reference/overloadResolution.types
index 970c47c0f50c1..003b99092e0d8 100644
--- a/tests/baselines/reference/overloadResolution.types
+++ b/tests/baselines/reference/overloadResolution.types
@@ -114,13 +114,13 @@ function fn3<T>(n: T): string;
 >n : T
 
 function fn3<T, U>(s: string, t: T, u: U): U;
->fn3 : { <T_1>(n: T_1): string; <T_2, U>(s: string, t: T, u: U): U; <T_3, U_1, V>(v: V, u: U_1, t: T_3): number; }
+>fn3 : { <T_1>(n: T_1): string; <T, U>(s: string, t: T, u: U): U; <T_2, U_1, V>(v: V, u: U_1, t: T_2): number; }
 >s : string
 >t : T
 >u : U
 
 function fn3<T, U, V>(v: V, u: U, t: T): number;
->fn3 : { <T_1>(n: T_1): string; <T_2, U_1>(s: string, t: T_2, u: U_1): U_1; <T_3, U_2, V>(v: V, u: U, t: T): number; }
+>fn3 : { <T_1>(n: T_1): string; <T_2, U_1>(s: string, t: T_2, u: U_1): U_1; <T, U, V>(v: V, u: U, t: T): number; }
 >v : V
 >u : U
 >t : T
@@ -188,7 +188,7 @@ function fn4<T extends string, U extends number>(n: T, m: U);
 >m : U
 
 function fn4<T extends number, U extends string>(n: T, m: U);
->fn4 : { <T_1 extends string, U_1 extends number>(n: T_1, m: U_1): any; <T_2 extends number, U_2 extends string>(n: T, m: U): any; }
+>fn4 : { <T_1 extends string, U_1 extends number>(n: T_1, m: U_1): any; <T extends number, U extends string>(n: T, m: U): any; }
 >n : T
 >m : U
 
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.types b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
index 902e11e77e9e2..69dd2d648763a 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.types
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
@@ -9,7 +9,7 @@ class A<T> {
 >v : A<S>
 
     static B<S>(v: S): A<S>;
->B : { <S_1>(v: A<S_1>): A<S_1>; <S_2>(v: S): A<S>; }
+>B : { <S_1>(v: A<S_1>): A<S_1>; <S>(v: S): A<S>; }
 >v : S
 
     static B<S>(v: any): A<S> {
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArity.types b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
index e33e4b0877383..0d1eec202b40d 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArity.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
@@ -14,7 +14,7 @@ declare function Callbacks<T1, T2>(flags?: string): void;
 >flags : string
 
 declare function Callbacks<T1, T2, T3>(flags?: string): void;
->Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1_1, T2_1>(flags?: string): void; <T1_2, T2_2, T3>(flags?: string): void; }
+>Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1_1, T2_1>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 >flags : string
 
 Callbacks<number, string, boolean>('s'); // no error
diff --git a/tests/baselines/reference/overloadsWithConstraints.types b/tests/baselines/reference/overloadsWithConstraints.types
index f9987595196a8..c8e1df7f66442 100644
--- a/tests/baselines/reference/overloadsWithConstraints.types
+++ b/tests/baselines/reference/overloadsWithConstraints.types
@@ -6,7 +6,7 @@ declare function f<T extends Number>(x: T): T;
 >x : T
 
 declare function f<T extends String>(x: T): T
->f : { <T_1 extends Number>(x: T_1): T_1; <T_2 extends String>(x: T): T; }
+>f : { <T_1 extends Number>(x: T_1): T_1; <T extends String>(x: T): T; }
 >x : T
 
 var v = f<string>("");
diff --git a/tests/baselines/reference/override19.types b/tests/baselines/reference/override19.types
index d075039baf17b..8aa0d3c811bed 100644
--- a/tests/baselines/reference/override19.types
+++ b/tests/baselines/reference/override19.types
@@ -27,7 +27,7 @@ class A {
 class B extends CreateMixin(Context, A) {
 >B : B
 >CreateMixin(Context, A) : A & { context: Context; }
->CreateMixin : <C_1 extends Foo, T extends Foo>(Context: C_1, Base: T) => T & (new (...args: any[]) => { context: InstanceType<C_1>; })
+>CreateMixin : <C extends Foo, T extends Foo>(Context: C, Base: T) => T & (new (...args: any[]) => { context: InstanceType<C>; })
 >Context : typeof Context
 >A : typeof A
 
@@ -38,7 +38,7 @@ class B extends CreateMixin(Context, A) {
 class C extends CreateMixin(Context, A) {
 >C : C
 >CreateMixin(Context, A) : A & { context: Context; }
->CreateMixin : <C_1 extends Foo, T extends Foo>(Context: C_1, Base: T) => T & (new (...args: any[]) => { context: InstanceType<C_1>; })
+>CreateMixin : <C extends Foo, T extends Foo>(Context: C, Base: T) => T & (new (...args: any[]) => { context: InstanceType<C>; })
 >Context : typeof Context
 >A : typeof A
 
diff --git a/tests/baselines/reference/parenthesizedContexualTyping1.types b/tests/baselines/reference/parenthesizedContexualTyping1.types
index 140e4acc2521c..7f7fe071a666e 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping1.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping1.types
@@ -8,7 +8,7 @@ function fun<T>(g: (x: T) => T, x: T): T;
 >x : T
 
 function fun<T>(g: (x: T) => T, h: (y: T) => T, x: T): T;
->fun : { <T_1>(g: (x: T_1) => T_1, x: T_1): T_1; <T_2>(g: (x: T) => T, h: (y: T) => T, x: T): T; }
+>fun : { <T_1>(g: (x: T_1) => T_1, x: T_1): T_1; <T>(g: (x: T) => T, h: (y: T) => T, x: T): T; }
 >g : (x: T) => T
 >x : T
 >h : (y: T) => T
diff --git a/tests/baselines/reference/parenthesizedContexualTyping2.types b/tests/baselines/reference/parenthesizedContexualTyping2.types
index 6b38396e89950..418eba21880b4 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping2.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping2.types
@@ -19,7 +19,7 @@ function fun<T>(f: FuncType, x: T): T;
 >x : T
 
 function fun<T>(f: FuncType, g: FuncType, x: T): T;
->fun : { <T_1>(f: FuncType, x: T_1): T_1; <T_2>(f: FuncType, g: FuncType, x: T): T; }
+>fun : { <T_1>(f: FuncType, x: T_1): T_1; <T>(f: FuncType, g: FuncType, x: T): T; }
 >f : FuncType
 >g : FuncType
 >x : T
diff --git a/tests/baselines/reference/parenthesizedContexualTyping3.types b/tests/baselines/reference/parenthesizedContexualTyping3.types
index 5fcca9fb3d0c7..5db70aaa3862f 100644
--- a/tests/baselines/reference/parenthesizedContexualTyping3.types
+++ b/tests/baselines/reference/parenthesizedContexualTyping3.types
@@ -14,7 +14,7 @@ function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, x: T): T;
 >x : T
 
 function tempFun<T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T;
->tempFun : { <T_1>(tempStrs: TemplateStringsArray, g: (x: T_1) => T_1, x: T_1): T_1; <T_2>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T; }
+>tempFun : { <T_1>(tempStrs: TemplateStringsArray, g: (x: T_1) => T_1, x: T_1): T_1; <T>(tempStrs: TemplateStringsArray, g: (x: T) => T, h: (y: T) => T, x: T): T; }
 >tempStrs : TemplateStringsArray
 >g : (x: T) => T
 >x : T
diff --git a/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types b/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
index 9454f587f2fb2..69aa9e1b8b316 100644
--- a/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
+++ b/tests/baselines/reference/parseArrowFunctionWithFunctionReturnType.types
@@ -2,7 +2,7 @@
 
 === parseArrowFunctionWithFunctionReturnType.ts ===
 const fn = <T>(): (() => T) => null as any;
->fn : <T>() => () => T
-><T>(): (() => T) => null as any : <T>() => () => T
+>fn : <T>() => (() => T)
+><T>(): (() => T) => null as any : <T>() => (() => T)
 >null as any : any
 
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
index f0c1acfbedb49..625bf487ea05b 100644
--- a/tests/baselines/reference/promiseChaining.types
+++ b/tests/baselines/reference/promiseChaining.types
@@ -26,7 +26,7 @@ class Chain<T> {
 >this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length) : Chain<number>
 >this.then(x => result)/*S*/.then(x => "abc")/*string*/.then : <S>(cb: (x: string) => S) => Chain<S>
 >this.then(x => result)/*S*/.then(x => "abc") : Chain<string>
->this.then(x => result)/*S*/.then : <S>(cb: (x: S) => S) => Chain<S>
+>this.then(x => result)/*S*/.then : <S>(cb: (x: S_1) => S) => Chain<S>
 >this.then(x => result) : Chain<S>
 >this.then : <S>(cb: (x: T) => S) => Chain<S>
 >this : this
@@ -34,7 +34,7 @@ class Chain<T> {
 >x => result : (x: T) => S
 >x : T
 >result : S
->then : <S>(cb: (x: S) => S) => Chain<S>
+>then : <S>(cb: (x: S_1) => S) => Chain<S>
 >x => "abc" : (x: S) => string
 >x : S
 >"abc" : "abc"
diff --git a/tests/baselines/reference/promiseChaining1.types b/tests/baselines/reference/promiseChaining1.types
index f0e369b92f41a..035742be3da3b 100644
--- a/tests/baselines/reference/promiseChaining1.types
+++ b/tests/baselines/reference/promiseChaining1.types
@@ -28,7 +28,7 @@ class Chain2<T extends { length: number }> {
 >this.then(x => result)/*S*/.then(x => "abc")/*Function*/.then(x => x.length) : Chain2<Function>
 >this.then(x => result)/*S*/.then(x => "abc")/*Function*/.then : <S extends Function>(cb: (x: Function) => S) => Chain2<S>
 >this.then(x => result)/*S*/.then(x => "abc") : Chain2<Function>
->this.then(x => result)/*S*/.then : <S extends Function>(cb: (x: S) => S) => Chain2<S>
+>this.then(x => result)/*S*/.then : <S extends Function>(cb: (x: S_1) => S) => Chain2<S>
 >this.then(x => result) : Chain2<S>
 >this.then : <S extends Function>(cb: (x: T) => S) => Chain2<S>
 >this : this
@@ -36,7 +36,7 @@ class Chain2<T extends { length: number }> {
 >x => result : (x: T) => S
 >x : T
 >result : S
->then : <S extends Function>(cb: (x: S) => S) => Chain2<S>
+>then : <S extends Function>(cb: (x: S_1) => S) => Chain2<S>
 >x => "abc" : (x: S) => string
 >x : S
 >"abc" : "abc"
diff --git a/tests/baselines/reference/promiseChaining2.types b/tests/baselines/reference/promiseChaining2.types
index 8407e4e87e0d6..55d2d6dad3aa1 100644
--- a/tests/baselines/reference/promiseChaining2.types
+++ b/tests/baselines/reference/promiseChaining2.types
@@ -28,7 +28,7 @@ class Chain2<T extends { length: number }> {
 >this.then(x => result).then(x => "abc").then(x => x.length) : Chain2<Function>
 >this.then(x => result).then(x => "abc").then : <S extends Function>(cb: (x: Function) => S) => Chain2<S>
 >this.then(x => result).then(x => "abc") : Chain2<Function>
->this.then(x => result).then : <S extends Function>(cb: (x: S) => S) => Chain2<S>
+>this.then(x => result).then : <S extends Function>(cb: (x: S_1) => S) => Chain2<S>
 >this.then(x => result) : Chain2<S>
 >this.then : <S extends Function>(cb: (x: T) => S) => Chain2<S>
 >this : this
@@ -36,7 +36,7 @@ class Chain2<T extends { length: number }> {
 >x => result : (x: T) => S
 >x : T
 >result : S
->then : <S extends Function>(cb: (x: S) => S) => Chain2<S>
+>then : <S extends Function>(cb: (x: S_1) => S) => Chain2<S>
 >x => "abc" : (x: S) => string
 >x : S
 >"abc" : "abc"
diff --git a/tests/baselines/reference/promisePermutations.types b/tests/baselines/reference/promisePermutations.types
index e2fbf785100cd..c19694eb8c488 100644
--- a/tests/baselines/reference/promisePermutations.types
+++ b/tests/baselines/reference/promisePermutations.types
@@ -12,7 +12,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): Promise<U_4>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => Promise<U_2>, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): Promise<U_3>; }
 >success : (value: T) => Promise<U>
 >value : T
 >error : (error: any) => U
@@ -21,7 +21,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): Promise<U_4>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): Promise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => Promise<U>
@@ -30,7 +30,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
@@ -59,7 +59,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => IPromise<U_2>, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => IPromise<U>
 >value : T
 >error : (error: any) => U
@@ -68,7 +68,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => IPromise<U>
@@ -77,7 +77,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
@@ -216,7 +216,7 @@ declare function testFunction12<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
->testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): IPromise<T>; }
+>testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): IPromise<T>; }
 >x : T
 >y : T
 
@@ -225,7 +225,7 @@ declare function testFunction12P<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
->testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): Promise<T>; }
+>testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): Promise<T>; }
 >x : T
 >y : T
 
diff --git a/tests/baselines/reference/promisePermutations2.types b/tests/baselines/reference/promisePermutations2.types
index c0fbc5721c524..2ec0727731a1a 100644
--- a/tests/baselines/reference/promisePermutations2.types
+++ b/tests/baselines/reference/promisePermutations2.types
@@ -34,7 +34,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => IPromise<U_2>, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => IPromise<U>
 >value : T
 >error : (error: any) => U
@@ -43,7 +43,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): IPromise<U_4>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): IPromise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => IPromise<U>
@@ -52,7 +52,7 @@ interface IPromise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>;
->then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>then : { <U_1>(success?: (value: T) => IPromise<U_1>, error?: (error: any) => IPromise<U_1>, progress?: (progress: any) => void): IPromise<U_1>; <U_2>(success?: (value: T) => IPromise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): IPromise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => IPromise<U_3>, progress?: (progress: any) => void): IPromise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
@@ -191,7 +191,7 @@ declare function testFunction12<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
->testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): IPromise<T>; }
+>testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): IPromise<T>; }
 >x : T
 >y : T
 
@@ -200,7 +200,7 @@ declare function testFunction12P<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
->testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): Promise<T>; }
+>testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): Promise<T>; }
 >x : T
 >y : T
 
diff --git a/tests/baselines/reference/promisePermutations3.types b/tests/baselines/reference/promisePermutations3.types
index dacc896422e0e..76cb0be4720e7 100644
--- a/tests/baselines/reference/promisePermutations3.types
+++ b/tests/baselines/reference/promisePermutations3.types
@@ -14,7 +14,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): Promise<U_4>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U>(success?: (value: T) => Promise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; <U_2>(success?: (value: T) => U_2, error?: (error: any) => Promise<U_2>, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): Promise<U_3>; }
 >success : (value: T) => Promise<U>
 >value : T
 >error : (error: any) => U
@@ -23,7 +23,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U_4>(success?: (value: T) => U_4, error?: (error: any) => U_4, progress?: (progress: any) => void): Promise<U_4>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U>(success?: (value: T) => U, error?: (error: any) => Promise<U>, progress?: (progress: any) => void): Promise<U>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => U_3, progress?: (progress: any) => void): Promise<U_3>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => Promise<U>
@@ -32,7 +32,7 @@ interface Promise<T> {
 >progress : any
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U_4>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => Promise<U_1>, error?: (error: any) => Promise<U_1>, progress?: (progress: any) => void): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U_2>, error?: (error: any) => U_2, progress?: (progress: any) => void): Promise<U_2>; <U_3>(success?: (value: T) => U_3, error?: (error: any) => Promise<U_3>, progress?: (progress: any) => void): Promise<U_3>; <U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void): Promise<U>; }
 >success : (value: T) => U
 >value : T
 >error : (error: any) => U
@@ -191,7 +191,7 @@ declare function testFunction12<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12<T>(x: T, y: T): IPromise<T>;
->testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): IPromise<T>; }
+>testFunction12 : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): IPromise<T>; }
 >x : T
 >y : T
 
@@ -200,7 +200,7 @@ declare function testFunction12P<T>(x: T): IPromise<T>;
 >x : T
 
 declare function testFunction12P<T>(x: T, y: T): Promise<T>;
->testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T_2>(x: T, y: T): Promise<T>; }
+>testFunction12P : { <T_1>(x: T_1): IPromise<T_1>; <T>(x: T, y: T): Promise<T>; }
 >x : T
 >y : T
 
diff --git a/tests/baselines/reference/promises.types b/tests/baselines/reference/promises.types
index c330cd7e28f86..b7e683e379b4c 100644
--- a/tests/baselines/reference/promises.types
+++ b/tests/baselines/reference/promises.types
@@ -8,7 +8,7 @@ interface Promise<T> {
 >value : T
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
->then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => U_1): Promise<U_1>; <U_2>(success?: (value: T) => Promise<U>): Promise<U>; }
+>then : { <TResult1 = T, TResult2 = never>(onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>; <U_1>(success?: (value: T) => U_1): Promise<U_1>; <U>(success?: (value: T) => Promise<U>): Promise<U>; }
 >success : (value: T) => Promise<U>
 >value : T
 
diff --git a/tests/baselines/reference/recursiveClassBaseType.types b/tests/baselines/reference/recursiveClassBaseType.types
index aaff0f8485ebb..e32597c4977fa 100644
--- a/tests/baselines/reference/recursiveClassBaseType.types
+++ b/tests/baselines/reference/recursiveClassBaseType.types
@@ -8,7 +8,7 @@ declare const p: <T>(fn: () => T) => T;
 >fn : () => T
 
 declare const Base: <T>(val: T) => { new(): T };
->Base : <T>(val: T) => new () => T
+>Base : <T>(val: T) => {    new (): T;}
 >val : T
 
 class C extends Base({ x: p<C[]>(() => []) }) { }
diff --git a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
index d4198da0cde85..08ee6337246c5 100644
--- a/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
+++ b/tests/baselines/reference/recursiveTypesUsedAsFunctionParameters.types
@@ -76,11 +76,11 @@ function other<T extends List<U>, U>() {
 >x : T
 
     function foo5<V>(x: List<V>): number;
->foo5 : { <V_1>(x: T): string; <V_2>(x: List<V>): number; <V_3>(x: MyList<V_3>): boolean; }
+>foo5 : { <V_1>(x: T): string; <V>(x: List<V>): number; <V_2>(x: MyList<V_2>): boolean; }
 >x : List<V>
 
     function foo5<V>(x: MyList<V>): boolean;
->foo5 : { <V_1>(x: T): string; <V_2>(x: List<V_2>): number; <V_3>(x: MyList<V>): boolean; }
+>foo5 : { <V_1>(x: T): string; <V_2>(x: List<V_2>): number; <V>(x: MyList<V>): boolean; }
 >x : MyList<V>
 
     function foo5<V>(x: any): any { return null; }
diff --git a/tests/baselines/reference/specializationError.types b/tests/baselines/reference/specializationError.types
index 6934a86a3b6ac..282706e271aa7 100644
--- a/tests/baselines/reference/specializationError.types
+++ b/tests/baselines/reference/specializationError.types
@@ -18,7 +18,7 @@ interface Bar {
 >element : string
 
     bar<T>(value: string): Promise<T>;
->bar : { (value: "Menu"): Promise<string>; <T_1>(value: string, element: string): Promise<T_1>; <T_2>(value: string): Promise<T>; }
+>bar : { (value: "Menu"): Promise<string>; <T_1>(value: string, element: string): Promise<T_1>; <T>(value: string): Promise<T>; }
 >value : string
 }
 
diff --git a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
index 7674f238a3fd8..805ca6d29e10d 100644
--- a/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
+++ b/tests/baselines/reference/stringLiteralTypeIsSubtypeOfString.types
@@ -240,7 +240,7 @@ function f12<T>(x: 'a');
 >x : "a"
 
 function f12<T>(x: T);
->f12 : { <T_1>(x: "a"): any; <T_2>(x: T): any; }
+>f12 : { <T_1>(x: "a"): any; <T>(x: T): any; }
 >x : T
 
 function f12<T>(x: any) { }
@@ -252,7 +252,7 @@ function f13<T extends String>(x: 'a');
 >x : "a"
 
 function f13<T extends String>(x: T);
->f13 : { <T_1 extends String>(x: "a"): any; <T_2 extends String>(x: T): any; }
+>f13 : { <T_1 extends String>(x: "a"): any; <T extends String>(x: T): any; }
 >x : T
 
 function f13<T extends String>(x: any) { }
@@ -280,7 +280,7 @@ function f15<T, U extends T>(x: 'a');
 >x : "a"
 
 function f15<T, U extends T>(x: U);
->f15 : { <T_1, U_1 extends T_1>(x: "a"): any; <T_2, U_2 extends T>(x: U): any; }
+>f15 : { <T_1, U_1 extends T_1>(x: "a"): any; <T, U extends T>(x: U): any; }
 >x : U
 
 function f15<T, U extends T>(x: any) { }
@@ -292,7 +292,7 @@ function f16<T extends String, U extends T>(x: 'a');
 >x : "a"
 
 function f16<T extends String, U extends T>(x: U);
->f16 : { <T_1 extends String, U_1 extends T_1>(x: "a"): any; <T_2 extends String, U_2 extends T>(x: U): any; }
+>f16 : { <T_1 extends String, U_1 extends T_1>(x: "a"): any; <T extends String, U extends T>(x: U): any; }
 >x : U
 
 function f16<T extends String, U extends T>(x: any) { }
diff --git a/tests/baselines/reference/styledComponentsInstantiaionLimitNotReached.types b/tests/baselines/reference/styledComponentsInstantiaionLimitNotReached.types
index bb4c363a0fc20..8f3eb7c82eb34 100644
--- a/tests/baselines/reference/styledComponentsInstantiaionLimitNotReached.types
+++ b/tests/baselines/reference/styledComponentsInstantiaionLimitNotReached.types
@@ -344,7 +344,7 @@ export interface StyledComponentBase<
         A | StyledComponentInnerAttrs<WithC>
     >;
     withComponent<WithC extends keyof JSX.IntrinsicElements | React.ComponentType<any>>(
->withComponent : { <WithC_1 extends AnyStyledComponent>(component: WithC_1): StyledComponent<StyledComponentInnerComponent<WithC_1>, T, O & StyledComponentInnerOtherProps<WithC_1>, A | StyledComponentInnerAttrs<WithC_1>>; <WithC_2 extends keyof JSX.IntrinsicElements | React.ComponentType<any>>(component: WithC): StyledComponent<WithC, T, O, A>; }
+>withComponent : { <WithC_1 extends AnyStyledComponent>(component: WithC_1): StyledComponent<StyledComponentInnerComponent<WithC_1>, T, O & StyledComponentInnerOtherProps<WithC_1>, A | StyledComponentInnerAttrs<WithC_1>>; <WithC extends keyof JSX.IntrinsicElements | React.ComponentType<any>>(component: WithC): StyledComponent<WithC, T, O, A>; }
 >JSX : any
 >React : any
 
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index e58394becd6a1..56aacd670482e 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -706,8 +706,8 @@ var r13b = [r13arg2, r13arg1];
 >r13arg1 : <T extends Derived[]>(x: Base[], y: T) => T
 
 var r14arg1 = <T>(x: { a: T; b: T }) => x.a;
->r14arg1 : <T>(x: { a: T; b: T; }) => T
-><T>(x: { a: T; b: T }) => x.a : <T>(x: { a: T; b: T; }) => T
+>r14arg1 : <T>(x: {    a: T;    b: T;}) => T
+><T>(x: { a: T; b: T }) => x.a : <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 1cff2f0edf256..38349bb1ece68 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -377,8 +377,8 @@ module Errors {
 >r6arg2 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
 
     var r7arg = <T>(x: { a: T; b: T }) => <T>null;
->r7arg : <T>(x: { a: T; b: T; }) => T
-><T>(x: { a: T; b: T }) => <T>null : <T>(x: { a: T; b: T; }) => T
+>r7arg : <T>(x: {    a: T;    b: T;}) => T
+><T>(x: { a: T; b: T }) => <T>null : <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -411,8 +411,8 @@ module Errors {
 >r7arg2 : (x: { a: string; b: number; }) => number
 
     var r7arg3 = <T extends Base>(x: { a: T; b: T }) => 1;
->r7arg3 : <T extends Base>(x: { a: T; b: T; }) => number
-><T extends Base>(x: { a: T; b: T }) => 1 : <T extends Base>(x: { a: T; b: T; }) => number
+>r7arg3 : <T extends Base>(x: {    a: T;    b: T;}) => number
+><T extends Base>(x: { a: T; b: T }) => 1 : <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.types b/tests/baselines/reference/subtypingWithCallSignatures4.types
index 536f6fa021650..c5a74c6ba43fc 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.types
@@ -80,8 +80,8 @@ declare function foo6(a: any): any;
 >a : any
 
 declare function foo11(a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
->foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
->a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>foo11 : { (a11: <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base): any; (a: any): any; }
+>a11 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -93,8 +93,8 @@ declare function foo11(a: any): any;
 >a : any
 
 declare function foo15(a15: <T>(x: { a: T; b: T }) => T[]);
->foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
->a15 : <T>(x: { a: T; b: T; }) => T[]
+>foo15 : { (a15: <T>(x: {    a: T;    b: T;}) => T[]): any; (a: any): any; }
+>a15 : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -104,8 +104,8 @@ declare function foo15(a: any): any;
 >a : any
 
 declare function foo16(a16: <T extends Base>(x: { a: T; b: T }) => T[]);
->foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
->a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
+>foo16 : { (a16: <T extends Base>(x: {    a: T;    b: T;}) => T[]): any; (a: any): any; }
+>a16 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -348,8 +348,8 @@ var r6b = [r6arg2, r6arg];
 >r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 
 var r11arg = <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null;
->r11arg : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
-><T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>r11arg : <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
+><T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null : <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -358,8 +358,8 @@ var r11arg = <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => <Base>null;
 ><Base>null : Base
 
 var r11arg2 = <T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null;
->r11arg2 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
-><T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>r11arg2 : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
+><T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null : <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -386,16 +386,16 @@ var r11b = [r11arg2, r11arg];
 >r11arg : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r15arg = <U, V>(x: { a: U; b: V; }) => <U[]>null;
->r15arg : <U, V>(x: { a: U; b: V; }) => U[]
-><U, V>(x: { a: U; b: V; }) => <U[]>null : <U, V>(x: { a: U; b: V; }) => U[]
+>r15arg : <U, V>(x: {    a: U;    b: V;}) => U[]
+><U, V>(x: { a: U; b: V; }) => <U[]>null : <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
 ><U[]>null : U[]
 
 var r15arg2 = <T>(x: { a: T; b: T }) => <T[]>null;
->r15arg2 : <T>(x: { a: T; b: T; }) => T[]
-><T>(x: { a: T; b: T }) => <T[]>null : <T>(x: { a: T; b: T; }) => T[]
+>r15arg2 : <T>(x: {    a: T;    b: T;}) => T[]
+><T>(x: { a: T; b: T }) => <T[]>null : <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -420,16 +420,16 @@ var r15b = [r15arg2, r15arg];
 >r15arg : <U, V>(x: { a: U; b: V; }) => U[]
 
 var r16arg = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
->r16arg : <T extends Base>(x: { a: T; b: T; }) => T[]
-><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: { a: T; b: T; }) => T[]
+>r16arg : <T extends Base>(x: {    a: T;    b: T;}) => T[]
+><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 ><T[]>null : T[]
 
 var r16arg2 = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
->r16arg2 : <T extends Base>(x: { a: T; b: T; }) => T[]
-><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: { a: T; b: T; }) => T[]
+>r16arg2 : <T extends Base>(x: {    a: T;    b: T;}) => T[]
+><T extends Base>(x: { a: T; b: T }) => <T[]>null : <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 9cf43fd1e83cf..2b4f592cd3f38 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -643,7 +643,7 @@ var r13b = [r13arg2, r13arg1];
 >r13arg1 : new <T extends Derived[]>(x: Base[], y: T) => T
 
 var r14arg1: new <T>(x: { a: T; b: T }) => T;
->r14arg1 : new <T>(x: { a: T; b: T; }) => T
+>r14arg1 : new <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 2c39d41384f87..7e2e81ca46cc7 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -349,7 +349,7 @@ module Errors {
 >r6arg2 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
 
     var r7arg1: new <T>(x: { a: T; b: T }) => T;
->r7arg1 : new <T>(x: { a: T; b: T; }) => T
+>r7arg1 : new <T>(x: {    a: T;    b: T;}) => T
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -379,7 +379,7 @@ module Errors {
 >r7arg2 : new (x: { a: string; b: number; }) => number
 
     var r7arg3: new <T extends Base>(x: { a: T; b: T }) => number;
->r7arg3 : new <T extends Base>(x: { a: T; b: T; }) => number
+>r7arg3 : new <T extends Base>(x: {    a: T;    b: T;}) => number
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.types b/tests/baselines/reference/subtypingWithConstructSignatures4.types
index f85e667bb1b6f..fafea41492305 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.types
@@ -80,8 +80,8 @@ declare function foo6(a: any): any;
 >a : any
 
 declare function foo11(a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
->foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>foo11 : { (a11: new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base): any; (a: any): any; }
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -93,8 +93,8 @@ declare function foo11(a: any): any;
 >a : any
 
 declare function foo15(a15: new <T>(x: { a: T; b: T }) => T[]);
->foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>foo15 : { (a15: new <T>(x: {    a: T;    b: T;}) => T[]): any; (a: any): any; }
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -104,8 +104,8 @@ declare function foo15(a: any): any;
 >a : any
 
 declare function foo16(a16: new <T extends Base>(x: { a: T; b: T }) => T[]);
->foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>foo16 : { (a16: new <T extends Base>(x: {    a: T;    b: T;}) => T[]): any; (a: any): any; }
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -323,7 +323,7 @@ var r6b = [r6arg2, r6arg];
 >r6arg : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 
 var r11arg: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base;
->r11arg : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
+>r11arg : new <T, U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
@@ -331,7 +331,7 @@ var r11arg: new <T, U>(x: { foo: T }, y: { foo: U; bar: U }) => Base;
 >bar : U
 
 var r11arg2: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->r11arg2 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>r11arg2 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -357,13 +357,13 @@ var r11b = [r11arg2, r11arg];
 >r11arg : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r15arg: new <U, V>(x: { a: U; b: V; }) => U[];
->r15arg : new <U, V>(x: { a: U; b: V; }) => U[]
+>r15arg : new <U, V>(x: {    a: U;    b: V;}) => U[]
 >x : { a: U; b: V; }
 >a : U
 >b : V
 
 var r15arg2: new <T>(x: { a: T; b: T }) => T[];
->r15arg2 : new <T>(x: { a: T; b: T; }) => T[]
+>r15arg2 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -387,13 +387,13 @@ var r15b = [r15arg2, r15arg];
 >r15arg : new <U, V>(x: { a: U; b: V; }) => U[]
 
 var r16arg: new <T extends Base>(x: { a: T; b: T }) => T[];
->r16arg : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>r16arg : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
 var r16arg2: new <T extends Base>(x: { a: T; b: T }) => T[];
->r16arg2 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>r16arg2 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.types b/tests/baselines/reference/subtypingWithConstructSignatures5.types
index 5083e308cc679..601b34fb700c1 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.types
@@ -183,7 +183,7 @@ interface I extends B {
 >y : T
 
     a14: new <T, U>(x: { a: T; b: U }) => T; // ok
->a14 : new <T, U>(x: { a: T; b: U; }) => T
+>a14 : new <T, U>(x: {    a: T;    b: U;}) => T
 >x : { a: T; b: U; }
 >a : T
 >b : U
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures6.types b/tests/baselines/reference/subtypingWithConstructSignatures6.types
index ee15eb9b4c042..b16692c6e3010 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures6.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures6.types
@@ -54,7 +54,7 @@ interface A { // T
 >arg : T
 
     a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
->a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
+>a11 : new <T>(x: {    foo: T;}, y: {    foo: T;    bar: T;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: T; bar: T; }
@@ -62,13 +62,13 @@ interface A { // T
 >bar : T
 
     a15: new <T>(x: { a: T; b: T }) => T[];
->a15 : new <T>(x: { a: T; b: T; }) => T[]
+>a15 : new <T>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
 
     a16: new <T extends Base>(x: { a: T; b: T }) => T[];
->a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
+>a16 : new <T extends Base>(x: {    a: T;    b: T;}) => T[]
 >x : { a: T; b: T; }
 >a : T
 >b : T
@@ -109,7 +109,7 @@ interface I5<T> extends A {
 
 interface I7<T> extends A {
     a11: new <U>(x: { foo: T }, y: { foo: U; bar: U }) => Base; 
->a11 : new <U>(x: {    foo: T;}, y: { foo: U; bar: U; }) => Base
+>a11 : new <U>(x: {    foo: T;}, y: {    foo: U;    bar: U;}) => Base
 >x : { foo: T; }
 >foo : T
 >y : { foo: U; bar: U; }
diff --git a/tests/baselines/reference/taggedTemplateContextualTyping1.types b/tests/baselines/reference/taggedTemplateContextualTyping1.types
index 93e6ed32e6139..d2e9489fed556 100644
--- a/tests/baselines/reference/taggedTemplateContextualTyping1.types
+++ b/tests/baselines/reference/taggedTemplateContextualTyping1.types
@@ -14,7 +14,7 @@ function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, x: T): T;
 >x : T
 
 function tempTag1<T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T;
->tempTag1 : { <T_1>(templateStrs: TemplateStringsArray, f: FuncType, x: T_1): T_1; <T_2>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T; }
+>tempTag1 : { <T_1>(templateStrs: TemplateStringsArray, f: FuncType, x: T_1): T_1; <T>(templateStrs: TemplateStringsArray, f: FuncType, h: FuncType, x: T): T; }
 >templateStrs : TemplateStringsArray
 >f : FuncType
 >h : FuncType
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
index d80a3bd5f9e31..188200780a6c0 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3.types
@@ -94,14 +94,14 @@ function fn3<T>(strs: TemplateStringsArray, n: T): string;
 >n : T
 
 function fn3<T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U;
->fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T_3, U_1, V>(strs: TemplateStringsArray, v: V, u: U_1, t: T_3): number; }
+>fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T_2, U_1, V>(strs: TemplateStringsArray, v: V, u: U_1, t: T_2): number; }
 >strs : TemplateStringsArray
 >s : string
 >t : T
 >u : U
 
 function fn3<T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number;
->fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U_1>(strs: TemplateStringsArray, s: string, t: T_2, u: U_1): U_1; <T_3, U_2, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
+>fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U_1>(strs: TemplateStringsArray, s: string, t: T_2, u: U_1): U_1; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
 >strs : TemplateStringsArray
 >v : V
 >u : U
@@ -178,7 +178,7 @@ function fn4<T extends string, U extends number>(strs: TemplateStringsArray, n:
 >m : U
 
 function fn4<T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U);
->fn4 : { <T_1 extends string, U_1 extends number>(strs: TemplateStringsArray, n: T_1, m: U_1): any; <T_2 extends number, U_2 extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
+>fn4 : { <T_1 extends string, U_1 extends number>(strs: TemplateStringsArray, n: T_1, m: U_1): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
 >strs : TemplateStringsArray
 >n : T
 >m : U
diff --git a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
index 602609d6d21d4..1b3b285f28013 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
+++ b/tests/baselines/reference/taggedTemplateStringsWithOverloadResolution3_ES6.types
@@ -94,14 +94,14 @@ function fn3<T>(strs: TemplateStringsArray, n: T): string;
 >n : T
 
 function fn3<T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U;
->fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T_3, U_1, V>(strs: TemplateStringsArray, v: V, u: U_1, t: T_3): number; }
+>fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T, U>(strs: TemplateStringsArray, s: string, t: T, u: U): U; <T_2, U_1, V>(strs: TemplateStringsArray, v: V, u: U_1, t: T_2): number; }
 >strs : TemplateStringsArray
 >s : string
 >t : T
 >u : U
 
 function fn3<T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number;
->fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U_1>(strs: TemplateStringsArray, s: string, t: T_2, u: U_1): U_1; <T_3, U_2, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
+>fn3 : { <T_1>(strs: TemplateStringsArray, n: T_1): string; <T_2, U_1>(strs: TemplateStringsArray, s: string, t: T_2, u: U_1): U_1; <T, U, V>(strs: TemplateStringsArray, v: V, u: U, t: T): number; }
 >strs : TemplateStringsArray
 >v : V
 >u : U
@@ -178,7 +178,7 @@ function fn4<T extends string, U extends number>(strs: TemplateStringsArray, n:
 >m : U
 
 function fn4<T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U);
->fn4 : { <T_1 extends string, U_1 extends number>(strs: TemplateStringsArray, n: T_1, m: U_1): any; <T_2 extends number, U_2 extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
+>fn4 : { <T_1 extends string, U_1 extends number>(strs: TemplateStringsArray, n: T_1, m: U_1): any; <T extends number, U extends string>(strs: TemplateStringsArray, n: T, m: U): any; (strs: TemplateStringsArray): any; }
 >strs : TemplateStringsArray
 >n : T
 >m : U
diff --git a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
index 22fd28158d7a3..3d9a23e9aaa8e 100644
--- a/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
+++ b/tests/baselines/reference/taggedTemplatesWithTypeArguments1.types
@@ -97,10 +97,10 @@ export const b = g<Stuff, number, string, boolean> `
 `;
 
 declare let obj: {
->obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }; }
+>obj : { prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {    returnedObjProp: T;}; }
 
     prop: <T>(strs: TemplateStringsArray, x: (input: T) => T) => {
->prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => { returnedObjProp: T; }
+>prop : <T>(strs: TemplateStringsArray, x: (input: T) => T) => {    returnedObjProp: T;}
 >strs : TemplateStringsArray
 >x : (input: T) => T
 >input : T
diff --git a/tests/baselines/reference/templateLiteralTypes1.types b/tests/baselines/reference/templateLiteralTypes1.types
index 0ce03eed14e89..a84c4f20c8fc8 100644
--- a/tests/baselines/reference/templateLiteralTypes1.types
+++ b/tests/baselines/reference/templateLiteralTypes1.types
@@ -268,12 +268,12 @@ declare function getProp<T, P0 extends keyof T & string, P1 extends keyof T[P0]
 >path : `${P0}.${P1}.${P2}`
 
 declare function getProp<T, P0 extends keyof T & string, P1 extends keyof T[P0] & string>(obj: T, path: `${P0}.${P1}`): T[P0][P1];
->getProp : { <T_1, P0_1 extends keyof T_1 & string, P1_1 extends keyof T_1[P0_1] & string, P2 extends keyof T_1[P0_1][P1_1] & string>(obj: T_1, path: `${P0_1}.${P1_1}.${P2}`): T_1[P0_1][P1_1][P2]; <T_2, P0_2 extends keyof T & string, P1_2 extends keyof T[P0] & string>(obj: T, path: `${P0}.${P1}`): T[P0][P1]; <T_3, P0_3 extends keyof T_3 & string>(obj: T_3, path: P0_3): T_3[P0_3]; (obj: object, path: string): unknown; }
+>getProp : { <T_1, P0_1 extends keyof T_1 & string, P1_1 extends keyof T_1[P0_1] & string, P2 extends keyof T_1[P0_1][P1_1] & string>(obj: T_1, path: `${P0_1}.${P1_1}.${P2}`): T_1[P0_1][P1_1][P2]; <T, P0 extends keyof T & string, P1 extends keyof T[P0] & string>(obj: T, path: `${P0}.${P1}`): T[P0][P1]; <T_2, P0_2 extends keyof T_2 & string>(obj: T_2, path: P0_2): T_2[P0_2]; (obj: object, path: string): unknown; }
 >obj : T
 >path : `${P0}.${P1}`
 
 declare function getProp<T, P0 extends keyof T & string>(obj: T, path: P0): T[P0];
->getProp : { <T_1, P0_1 extends keyof T_1 & string, P1 extends keyof T_1[P0_1] & string, P2 extends keyof T_1[P0_1][P1] & string>(obj: T_1, path: `${P0_1}.${P1}.${P2}`): T_1[P0_1][P1][P2]; <T_2, P0_2 extends keyof T_2 & string, P1_1 extends keyof T_2[P0_2] & string>(obj: T_2, path: `${P0_2}.${P1_1}`): T_2[P0_2][P1_1]; <T_3, P0_3 extends keyof T & string>(obj: T, path: P0): T[P0]; (obj: object, path: string): unknown; }
+>getProp : { <T_1, P0_1 extends keyof T_1 & string, P1 extends keyof T_1[P0_1] & string, P2 extends keyof T_1[P0_1][P1] & string>(obj: T_1, path: `${P0_1}.${P1}.${P2}`): T_1[P0_1][P1][P2]; <T_2, P0_2 extends keyof T_2 & string, P1_1 extends keyof T_2[P0_2] & string>(obj: T_2, path: `${P0_2}.${P1_1}`): T_2[P0_2][P1_1]; <T, P0 extends keyof T & string>(obj: T, path: P0): T[P0]; (obj: object, path: string): unknown; }
 >obj : T
 >path : P0
 
diff --git a/tests/baselines/reference/templateLiteralTypes3.types b/tests/baselines/reference/templateLiteralTypes3.types
index 388a1f8e9b7f7..67115bf715ab6 100644
--- a/tests/baselines/reference/templateLiteralTypes3.types
+++ b/tests/baselines/reference/templateLiteralTypes3.types
@@ -395,7 +395,7 @@ declare function chain<F extends keyof Schema>(field: F | `${F}.${F}`): void;
 
 chain("a");
 >chain("a") : void
->chain : <F_1 extends "a">(field: F_1 | `${F_1}.${F_1}`) => void
+>chain : <F extends "a">(field: F | `${F}.${F}`) => void
 >"a" : "a"
 
 // Repro from #46125
diff --git a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
index 9fff92177d3d4..39a4eda327e29 100644
--- a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
+++ b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
@@ -24,7 +24,7 @@ interface Combinators {
 >y : U
 
     map<T, U>(c: Collection<T,U>, f: (x: T, y: U) => any): Collection<any, any>;
->map : { <T_1, U_1, V>(c: Collection<T_1, U_1>, f: (x: T_1, y: U_1) => V): Collection<T_1, V>; <T_2, U_2>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; }
+>map : { <T_1, U_1, V>(c: Collection<T_1, U_1>, f: (x: T_1, y: U_1) => V): Collection<T_1, V>; <T, U>(c: Collection<T, U>, f: (x: T, y: U) => any): Collection<any, any>; }
 >c : Collection<T, U>
 >f : (x: T, y: U) => any
 >x : T
diff --git a/tests/baselines/reference/tslibReExportHelpers2.types b/tests/baselines/reference/tslibReExportHelpers2.types
index 8b36a5492ac4b..1c0b27ec23bd0 100644
--- a/tests/baselines/reference/tslibReExportHelpers2.types
+++ b/tests/baselines/reference/tslibReExportHelpers2.types
@@ -19,7 +19,7 @@ export declare function __classPrivateFieldGet<T extends object, V>(
 
 ): V;
 export declare function __classPrivateFieldGet<T extends new (...args: any[]) => unknown, V>(
->__classPrivateFieldGet : { <T_1 extends object, V_1>(receiver: T_1, state: { has(o: T_1): boolean; get(o: T_1): V_1; }, kind?: "f"): V_1; <T_2 extends new (...args: any[]) => unknown, V_2>(receiver: T, state: T, kind: "f", f: {    value: V;}): V; }
+>__classPrivateFieldGet : { <T_1 extends object, V_1>(receiver: T_1, state: { has(o: T_1): boolean; get(o: T_1): V_1; }, kind?: "f"): V_1; <T extends new (...args: any[]) => unknown, V>(receiver: T, state: T, kind: "f", f: {    value: V;}): V; }
 >args : any[]
 
   receiver: T,
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
index 4d452a55ff46c..98db4b9d6b071 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.types
@@ -9,7 +9,7 @@ declare function OverloadComponent<U>(): JSX.Element;
 >JSX : any
 
 declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": boolean}): JSX.Element;
->OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: {    b: U;    a?: string;    "ignore-prop": boolean;}): JSX.Element; <T, U_3>(attr: { b: U_3; a: T; }): JSX.Element; }
+>OverloadComponent : { <U_1>(): JSX.Element; <U>(attr: {    b: U;    a?: string;    "ignore-prop": boolean;}): JSX.Element; <T, U_2>(attr: { b: U_2; a: T; }): JSX.Element; }
 >attr : { b: U; a?: string; "ignore-prop": boolean; }
 >b : U
 >a : string
@@ -17,7 +17,7 @@ declare function OverloadComponent<U>(attr: {b: U, a?: string, "ignore-prop": bo
 >JSX : any
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
->OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: { b: U_2; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U_3>(attr: {    b: U;    a: T;}): JSX.Element; }
+>OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: { b: U_2; a?: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: {    b: U;    a: T;}): JSX.Element; }
 >attr : { b: U; a: T; }
 >b : U
 >a : T
@@ -90,7 +90,7 @@ declare function Link<U>(l: {func: (arg: U)=>void}): JSX.Element;
 >JSX : any
 
 declare function Link<U>(l: {func: (arg1:U, arg2: string)=>void}): JSX.Element;
->Link : { <U_1>(l: { func: (arg: U_1) => void; }): JSX.Element; <U_2>(l: { func: (arg1: U, arg2: string) => void; }): JSX.Element; }
+>Link : { <U_1>(l: { func: (arg: U_1) => void; }): JSX.Element; <U>(l: { func: (arg1: U, arg2: string) => void; }): JSX.Element; }
 >l : { func: (arg1: U, arg2: string) => void; }
 >func : (arg1: U, arg2: string) => void
 >arg1 : U
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
index c1f0a3ff7be49..17e91467582c5 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.types
@@ -9,7 +9,7 @@ declare function OverloadComponent<U>(): JSX.Element;
 >JSX : any
 
 declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element;
->OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: {    b: U;    a: string;    "ignore-prop": boolean;}): JSX.Element; <T, U_3>(attr: { b: U_3; a: T; }): JSX.Element; }
+>OverloadComponent : { <U_1>(): JSX.Element; <U>(attr: {    b: U;    a: string;    "ignore-prop": boolean;}): JSX.Element; <T, U_2>(attr: { b: U_2; a: T; }): JSX.Element; }
 >attr : { b: U; a: string; "ignore-prop": boolean; }
 >b : U
 >a : string
@@ -17,7 +17,7 @@ declare function OverloadComponent<U>(attr: {b: U, a: string, "ignore-prop": boo
 >JSX : any
 
 declare function OverloadComponent<T, U>(attr: {b: U, a: T}): JSX.Element;
->OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: { b: U_2; a: string; "ignore-prop": boolean; }): JSX.Element; <T, U_3>(attr: {    b: U;    a: T;}): JSX.Element; }
+>OverloadComponent : { <U_1>(): JSX.Element; <U_2>(attr: { b: U_2; a: string; "ignore-prop": boolean; }): JSX.Element; <T, U>(attr: {    b: U;    a: T;}): JSX.Element; }
 >attr : { b: U; a: T; }
 >b : U
 >a : T
diff --git a/tests/baselines/reference/tupleTypeInference.types b/tests/baselines/reference/tupleTypeInference.types
index 5c20b00cf4921..fdf858abd3e54 100644
--- a/tests/baselines/reference/tupleTypeInference.types
+++ b/tests/baselines/reference/tupleTypeInference.types
@@ -10,11 +10,11 @@ interface IQService {
 >x : [IPromise<T1>, IPromise<T2>, IPromise<T3>]
 
     all<T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>;
->all : { <T1_1, T2_1, T3>(x: [IPromise<T1_1>, IPromise<T2_1>, IPromise<T3>]): IPromise<[T1_1, T2_1, T3]>; <T1_2, T2_2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>; <T1_3>(x: [IPromise<T1_3>]): IPromise<[T1_3]>; }
+>all : { <T1_1, T2_1, T3>(x: [IPromise<T1_1>, IPromise<T2_1>, IPromise<T3>]): IPromise<[T1_1, T2_1, T3]>; <T1, T2>(x: [IPromise<T1>, IPromise<T2>]): IPromise<[T1, T2]>; <T1_2>(x: [IPromise<T1_2>]): IPromise<[T1_2]>; }
 >x : [IPromise<T1>, IPromise<T2>]
 
     all<T1>(x: [IPromise<T1>]): IPromise<[T1]>;
->all : { <T1_1, T2, T3>(x: [IPromise<T1_1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1_1, T2, T3]>; <T1_2, T2_1>(x: [IPromise<T1_2>, IPromise<T2_1>]): IPromise<[T1_2, T2_1]>; <T1_3>(x: [IPromise<T1>]): IPromise<[T1]>; }
+>all : { <T1_1, T2, T3>(x: [IPromise<T1_1>, IPromise<T2>, IPromise<T3>]): IPromise<[T1_1, T2, T3]>; <T1_2, T2_1>(x: [IPromise<T1_2>, IPromise<T2_1>]): IPromise<[T1_2, T2_1]>; <T1>(x: [IPromise<T1>]): IPromise<[T1]>; }
 >x : [IPromise<T1>]
 
     when<T>(t?: T): IPromise<T>;
diff --git a/tests/baselines/reference/twiceNestedKeyofIndexInference.types b/tests/baselines/reference/twiceNestedKeyofIndexInference.types
index 52040db975a5e..68c0babf04bcc 100644
--- a/tests/baselines/reference/twiceNestedKeyofIndexInference.types
+++ b/tests/baselines/reference/twiceNestedKeyofIndexInference.types
@@ -22,7 +22,7 @@ declare function set<T, K1 extends keyof T>(source: T, path: [K1], value: T[K1])
 >value : T[K1]
 
 declare function set<T, K1 extends keyof T, K2 extends keyof T[K1]>(source: T, path: [K1, K2], value: T[K1][K2]): Set2<T, K1, K2>;
->set : { <T_1, K1_1 extends keyof T_1>(source: T_1, path: [K1_1], value: T_1[K1_1]): Set1<T_1, K1_1>; <T_2, K1_2 extends keyof T, K2 extends keyof T[K1]>(source: T, path: [K1, K2], value: T[K1][K2]): Set2<T, K1, K2>; }
+>set : { <T_1, K1_1 extends keyof T_1>(source: T_1, path: [K1_1], value: T_1[K1_1]): Set1<T_1, K1_1>; <T, K1 extends keyof T, K2 extends keyof T[K1]>(source: T, path: [K1, K2], value: T[K1][K2]): Set2<T, K1, K2>; }
 >source : T
 >path : [K1, K2]
 >value : T[K1][K2]
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
index 08934a5f14e0d..42ee590b400db 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
@@ -98,7 +98,7 @@ interface D<T, U> {
 
 interface D<T, U> {
     foo<W>(x: W, y: W): T;
->foo : { <A_1>(x: A_1, y: A_1): U; <W>(x: W, y: W): T; }
+>foo : { <A>(x: A, y: A): U; <W>(x: W, y: W): T; }
 >x : W
 >y : W
 }
@@ -109,9 +109,9 @@ var d: D<boolean, Date>;
 var r3 = d.foo(1, 1); // boolean, last definition wins
 >r3 : boolean
 >d.foo(1, 1) : boolean
->d.foo : { <A_1>(x: A_1, y: A_1): Date; <W>(x: W, y: W): boolean; }
+>d.foo : { <A>(x: A, y: A): Date; <W>(x: W, y: W): boolean; }
 >d : D<boolean, Date>
->foo : { <A_1>(x: A_1, y: A_1): Date; <W>(x: W, y: W): boolean; }
+>foo : { <A>(x: A, y: A): Date; <W>(x: W, y: W): boolean; }
 >1 : 1
 >1 : 1
 
diff --git a/tests/baselines/reference/typeAliases.types b/tests/baselines/reference/typeAliases.types
index 9ae9eb2209130..28f9934eb3641 100644
--- a/tests/baselines/reference/typeAliases.types
+++ b/tests/baselines/reference/typeAliases.types
@@ -130,13 +130,13 @@ declare function foo13<T1 extends I13, T2 extends T13>(t1: T1, t2: T13): void;
 
 foo13(x13_1, x13_2);
 >foo13(x13_1, x13_2) : void
->foo13 : <T1_1 extends I13, T2_1 extends I13>(t1: T1_1, t2: I13) => void
+>foo13 : <T1 extends I13, T2 extends I13>(t1: T1, t2: I13) => void
 >x13_1 : I13
 >x13_2 : I13
 
 foo13(x13_2, x13_1);
 >foo13(x13_2, x13_1) : void
->foo13 : <T1_1 extends I13, T2_1 extends I13>(t1: T1_1, t2: I13) => void
+>foo13 : <T1 extends I13, T2 extends I13>(t1: T1, t2: I13) => void
 >x13_2 : I13
 >x13_1 : I13
 
diff --git a/tests/baselines/reference/typeArgumentConstraintResolution1.types b/tests/baselines/reference/typeArgumentConstraintResolution1.types
index 331810369b696..ce8cf875f3e4c 100644
--- a/tests/baselines/reference/typeArgumentConstraintResolution1.types
+++ b/tests/baselines/reference/typeArgumentConstraintResolution1.types
@@ -6,7 +6,7 @@ function foo1<T extends Date>(test: T);
 >test : T
 
 function foo1<T extends Number>(test: string);
->foo1 : { <T_1 extends Date>(test: T_1): any; <T_2 extends Number>(test: string): any; }
+>foo1 : { <T_1 extends Date>(test: T_1): any; <T extends Number>(test: string): any; }
 >test : string
 
 function foo1<T extends String>(test: any) { }
@@ -25,7 +25,7 @@ function foo2<T extends Date>(test: T): T;
 >test : T
 
 function foo2<T extends Number>(test: string): T; 
->foo2 : { <T_1 extends Date>(test: T_1): T_1; <T_2 extends Number>(test: string): T; }
+>foo2 : { <T_1 extends Date>(test: T_1): T_1; <T extends Number>(test: string): T; }
 >test : string
 
 function foo2<T extends String>(test: any): any { return null; }
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
index 5e2d463b83a9b..3fc62fcb89592 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
@@ -8,7 +8,7 @@ function foo1<T>(x: T);
 >x : T
 
 function foo1<T>(x: T); // no error, different declaration for each T
->foo1 : { <T_1>(x: T_1): any; <T_2>(x: T): any; }
+>foo1 : { <T_1>(x: T_1): any; <T>(x: T): any; }
 >x : T
 
 function foo1<T>(x: T) { }
@@ -20,7 +20,7 @@ function foo2<T, U>(x: T);
 >x : T
 
 function foo2<T, U>(x: T); // no error, different declaration for each T
->foo2 : { <T_1, U_1>(x: T_1): any; <T_2, U_2>(x: T): any; }
+>foo2 : { <T_1, U_1>(x: T_1): any; <T, U>(x: T): any; }
 >x : T
 
 function foo2<T, U>(x: T) { }
@@ -49,7 +49,7 @@ function foo3<T, U>(x: T, y: U) {
 >x : T
 
     function inner2<T>(x: T); // no error, different T
->inner2 : { (x: T): any; <T_1>(x: T): any; }
+>inner2 : { (x: T): any; <T_1>(x: T_1): any; }
 >x : T
 
     function inner2(x: any) { }
@@ -78,7 +78,7 @@ class C<T> {
 >x : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : { <U_1>(a: T, x: U_1): any; <U_2>(a: T, x: U): any; }
+>foo2 : { <U_1>(a: T, x: U_1): any; <U>(a: T, x: U): any; }
 >a : T
 >x : U
 
@@ -92,7 +92,7 @@ class C<T> {
 >x : T
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : { <T_1>(x: T_1): any; <T_2>(x: T): any; }
+>foo3 : { <T_1>(x: T_1): any; <T>(x: T): any; }
 >x : T
 
     foo3<T>(x: T) { }
@@ -104,7 +104,7 @@ class C<T> {
 >x : T
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
->foo4 : { <T_1 extends Date>(x: T_1): any; <T_2 extends Date>(x: T): any; }
+>foo4 : { <T_1 extends Date>(x: T_1): any; <T extends Date>(x: T): any; }
 >x : T
 
     foo4<T extends Date>(x: T) { }
@@ -133,7 +133,7 @@ class C2<T extends Date> {
 >x : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : { <U_1>(a: T, x: U_1): any; <U_2>(a: T, x: U): any; }
+>foo2 : { <U_1>(a: T, x: U_1): any; <U>(a: T, x: U): any; }
 >a : T
 >x : U
 
@@ -147,7 +147,7 @@ class C2<T extends Date> {
 >x : T
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : { <T_1>(x: T_1): any; <T_2>(x: T): any; }
+>foo3 : { <T_1>(x: T_1): any; <T>(x: T): any; }
 >x : T
 
     foo3<T>(x: T) { }
@@ -170,7 +170,7 @@ interface I<T> {
 >x : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : { <U_1>(a: T, x: U_1): any; <U_2>(a: T, x: U): any; }
+>foo2 : { <U_1>(a: T, x: U_1): any; <U>(a: T, x: U): any; }
 >a : T
 >x : U
 
@@ -179,7 +179,7 @@ interface I<T> {
 >x : T
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : { <T_1>(x: T_1): any; <T_2>(x: T): any; }
+>foo3 : { <T_1>(x: T_1): any; <T>(x: T): any; }
 >x : T
 
     foo4<T extends Date>(x: T);
@@ -187,7 +187,7 @@ interface I<T> {
 >x : T
 
     foo4<T extends Date>(x: T); // no error, different declaration for each T
->foo4 : { <T_1 extends Date>(x: T_1): any; <T_2 extends Date>(x: T): any; }
+>foo4 : { <T_1 extends Date>(x: T_1): any; <T extends Date>(x: T): any; }
 >x : T
 }
 
@@ -206,7 +206,7 @@ interface I2<T extends Date> {
 >x : U
 
     foo2<U>(a: T, x: U); // no error, different declaration for each U
->foo2 : { <U_1>(a: T, x: U_1): any; <U_2>(a: T, x: U): any; }
+>foo2 : { <U_1>(a: T, x: U_1): any; <U>(a: T, x: U): any; }
 >a : T
 >x : U
 
@@ -215,6 +215,6 @@ interface I2<T extends Date> {
 >x : T
 
     foo3<T>(x: T); // no error, different declaration for each T
->foo3 : { <T_1>(x: T_1): any; <T_2>(x: T): any; }
+>foo3 : { <T_1>(x: T_1): any; <T>(x: T): any; }
 >x : T
 }
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index cc4dc7eba2b18..bec03282c2935 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -9,7 +9,7 @@ interface Query<T> {
 >item : T
 
     selectMany<U>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => R): Query<R>;
->selectMany : { <U_1>(selector: (item: T) => U_1[]): Query<U_1>; <U_2>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => R): Query<R>; }
+>selectMany : { <U_1>(selector: (item: T) => U_1[]): Query<U_1>; <U>(arraySelector: (item: T) => U[], resultSelector: (outer: T, inner: U) => R): Query<R>; }
 >arraySelector : (item: T) => U[]
 >item : T
 >resultSelector : (outer: T, inner: U) => R
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index d76badc5861c7..25a70dcc7e165 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -3229,11 +3229,11 @@ module Underscore {
 >list : T[]
 
         chain<T>(list: Dictionary<T>): ChainedDictionary<T>;
->chain : { <T_1>(list: T_1[]): ChainedArray<T_1>; <T_2>(list: Dictionary<T>): ChainedDictionary<T>; <T_3>(obj: T_3): ChainedObject<T_3>; }
+>chain : { <T_1>(list: T_1[]): ChainedArray<T_1>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T_2>(obj: T_2): ChainedObject<T_2>; }
 >list : Dictionary<T>
 
         chain<T>(obj: T): ChainedObject<T>;
->chain : { <T_1>(list: T_1[]): ChainedArray<T_1>; <T_2>(list: Dictionary<T_2>): ChainedDictionary<T_2>; <T_3>(obj: T): ChainedObject<T>; }
+>chain : { <T_1>(list: T_1[]): ChainedArray<T_1>; <T_2>(list: Dictionary<T_2>): ChainedDictionary<T_2>; <T>(obj: T): ChainedObject<T>; }
 >obj : T
 
         each<T>(list: T[], iterator: Iterator_<T, void>, context?: any): void;
@@ -3243,7 +3243,7 @@ module Underscore {
 >context : any
 
         each<T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void;
->each : { <T_1>(list: T_1[], iterator: Iterator_<T_1, void>, context?: any): void; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
+>each : { <T_1>(list: T_1[], iterator: Iterator_<T_1, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, void>
 >context : any
@@ -3255,7 +3255,7 @@ module Underscore {
 >context : any
 
         forEach<T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void;
->forEach : { <T_1>(list: T_1[], iterator: Iterator_<T_1, void>, context?: any): void; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
+>forEach : { <T_1>(list: T_1[], iterator: Iterator_<T_1, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator_<T, void>, context?: any): void; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, void>
 >context : any
@@ -3267,7 +3267,7 @@ module Underscore {
 >context : any
 
         map<T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[];
->map : { <T_1, U_1>(list: T_1[], iterator: Iterator_<T_1, U_1>, context?: any): U_1[]; <T_2, U_2>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
+>map : { <T_1, U_1>(list: T_1[], iterator: Iterator_<T_1, U_1>, context?: any): U_1[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, U>
 >context : any
@@ -3279,7 +3279,7 @@ module Underscore {
 >context : any
 
         collect<T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[];
->collect : { <T_1, U_1>(list: T_1[], iterator: Iterator_<T_1, U_1>, context?: any): U_1[]; <T_2, U_2>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
+>collect : { <T_1, U_1>(list: T_1[], iterator: Iterator_<T_1, U_1>, context?: any): U_1[]; <T, U>(list: Dictionary<T>, iterator: Iterator_<T, U>, context?: any): U[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, U>
 >context : any
@@ -3292,21 +3292,21 @@ module Underscore {
 >context : any
 
         reduce<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_2>(list: Dictionary<T_2>, iterator: Reducer<T_2, T_2>, initialValue?: T_2, context?: any): T_2; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : T[]
 >iterator : Reducer<T, U>
 >initialValue : U
 >context : any
 
         reduce<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : Dictionary<T>
 >iterator : Reducer<T, T>
 >initialValue : T
 >context : any
 
         reduce<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_2>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
+>reduce : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >list : Dictionary<T>
 >iterator : Reducer<T, U>
 >initialValue : U
@@ -3320,21 +3320,21 @@ module Underscore {
 >context : any
 
         foldl<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_2>(list: Dictionary<T_2>, iterator: Reducer<T_2, T_2>, initialValue?: T_2, context?: any): T_2; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : T[]
 >iterator : Reducer<T, U>
 >initialValue : U
 >context : any
 
         foldl<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : Dictionary<T>
 >iterator : Reducer<T, T>
 >initialValue : T
 >context : any
 
         foldl<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_2>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
+>foldl : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >list : Dictionary<T>
 >iterator : Reducer<T, U>
 >initialValue : U
@@ -3348,21 +3348,21 @@ module Underscore {
 >context : any
 
         inject<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_2>(list: Dictionary<T_2>, iterator: Reducer<T_2, T_2>, initialValue?: T_2, context?: any): T_2; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : T[]
 >iterator : Reducer<T, U>
 >initialValue : U
 >context : any
 
         inject<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : Dictionary<T>
 >iterator : Reducer<T, T>
 >initialValue : T
 >context : any
 
         inject<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_2>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
+>inject : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >list : Dictionary<T>
 >iterator : Reducer<T, U>
 >initialValue : U
@@ -3376,21 +3376,21 @@ module Underscore {
 >context : any
 
         reduceRight<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_2>(list: Dictionary<T_2>, iterator: Reducer<T_2, T_2>, initialValue?: T_2, context?: any): T_2; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : T[]
 >iterator : Reducer<T, U>
 >initialValue : U
 >context : any
 
         reduceRight<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : Dictionary<T>
 >iterator : Reducer<T, T>
 >initialValue : T
 >context : any
 
         reduceRight<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_2>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
+>reduceRight : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >list : Dictionary<T>
 >iterator : Reducer<T, U>
 >initialValue : U
@@ -3404,21 +3404,21 @@ module Underscore {
 >context : any
 
         foldr<T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T_2>(list: Dictionary<T_2>, iterator: Reducer<T_2, T_2>, initialValue?: T_2, context?: any): T_2; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : T[]
 >iterator : Reducer<T, U>
 >initialValue : U
 >context : any
 
         foldr<T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
->foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T_3>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_4, U_1>(list: Dictionary<T_4>, iterator: Reducer<T_4, U_1>, initialValue: U_1, context?: any): U_1; }
+>foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U>(list: T_2[], iterator: Reducer<T_2, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T_3, U_1>(list: Dictionary<T_3>, iterator: Reducer<T_3, U_1>, initialValue: U_1, context?: any): U_1; }
 >list : Dictionary<T>
 >iterator : Reducer<T, T>
 >initialValue : T
 >context : any
 
         foldr<T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U;
->foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T_4, U_2>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
+>foldr : { <T_1>(list: T_1[], iterator: Reducer<T_1, T_1>, initialValue?: T_1, context?: any): T_1; <T_2, U_1>(list: T_2[], iterator: Reducer<T_2, U_1>, initialValue: U_1, context?: any): U_1; <T_3>(list: Dictionary<T_3>, iterator: Reducer<T_3, T_3>, initialValue?: T_3, context?: any): T_3; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >list : Dictionary<T>
 >iterator : Reducer<T, U>
 >initialValue : U
@@ -3431,7 +3431,7 @@ module Underscore {
 >context : any
 
         find<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T;
->find : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
+>find : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3443,7 +3443,7 @@ module Underscore {
 >context : any
 
         detect<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T;
->detect : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
+>detect : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3455,7 +3455,7 @@ module Underscore {
 >context : any
 
         filter<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
->filter : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
+>filter : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3467,7 +3467,7 @@ module Underscore {
 >context : any
 
         select<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
->select : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
+>select : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3478,7 +3478,7 @@ module Underscore {
 >properties : Object
 
         where<T>(list: Dictionary<T>, properties: Object): T[];
->where : { <T_1>(list: T_1[], properties: Object): T_1[]; <T_2>(list: Dictionary<T>, properties: Object): T[]; }
+>where : { <T_1>(list: T_1[], properties: Object): T_1[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
 >list : Dictionary<T>
 >properties : Object
 
@@ -3488,7 +3488,7 @@ module Underscore {
 >properties : Object
 
         findWhere<T>(list: Dictionary<T>, properties: Object): T;
->findWhere : { <T_1>(list: T_1[], properties: Object): T_1; <T_2>(list: Dictionary<T>, properties: Object): T; }
+>findWhere : { <T_1>(list: T_1[], properties: Object): T_1; <T>(list: Dictionary<T>, properties: Object): T; }
 >list : Dictionary<T>
 >properties : Object
 
@@ -3499,7 +3499,7 @@ module Underscore {
 >context : any
 
         reject<T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[];
->reject : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
+>reject : { <T_1>(list: T_1[], iterator: Iterator_<T_1, boolean>, context?: any): T_1[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, boolean>, context?: any): T[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3511,7 +3511,7 @@ module Underscore {
 >context : any
 
         every<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
->every : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
+>every : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3523,7 +3523,7 @@ module Underscore {
 >context : any
 
         all<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
->all : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
+>all : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3535,7 +3535,7 @@ module Underscore {
 >context : any
 
         some<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
->some : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
+>some : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3547,7 +3547,7 @@ module Underscore {
 >context : any
 
         any<T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean;
->any : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
+>any : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator_<T, boolean>, context?: any): boolean; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, boolean>
 >context : any
@@ -3558,7 +3558,7 @@ module Underscore {
 >value : T
 
         contains<T>(list: Dictionary<T>, value: T): boolean;
->contains : { <T_1>(list: T_1[], value: T_1): boolean; <T_2>(list: Dictionary<T>, value: T): boolean; }
+>contains : { <T_1>(list: T_1[], value: T_1): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
 >list : Dictionary<T>
 >value : T
 
@@ -3568,7 +3568,7 @@ module Underscore {
 >value : T
 
         include<T>(list: Dictionary<T>, value: T): boolean;
->include : { <T_1>(list: T_1[], value: T_1): boolean; <T_2>(list: Dictionary<T>, value: T): boolean; }
+>include : { <T_1>(list: T_1[], value: T_1): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
 >list : Dictionary<T>
 >value : T
 
@@ -3601,7 +3601,7 @@ module Underscore {
 >context : any
 
         max<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T;
->max : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): T_1; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
+>max : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): T_1; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, any>
 >context : any
@@ -3613,7 +3613,7 @@ module Underscore {
 >context : any
 
         min<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T;
->min : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): T_1; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
+>min : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): T_1; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): T; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, any>
 >context : any
@@ -3625,18 +3625,18 @@ module Underscore {
 >context : any
 
         sortBy<T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[];
->sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T_2>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T_3>(list: T_3[], propertyName: string): T_3[]; <T_4>(list: Dictionary<T_4>, propertyName: string): T_4[]; }
+>sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T>(list: Dictionary<T>, iterator: Iterator_<T, any>, context?: any): T[]; <T_2>(list: T_2[], propertyName: string): T_2[]; <T_3>(list: Dictionary<T_3>, propertyName: string): T_3[]; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, any>
 >context : any
 
         sortBy<T>(list: T[], propertyName: string): T[];
->sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T_2>(list: Dictionary<T_2>, iterator: Iterator_<T_2, any>, context?: any): T_2[]; <T_3>(list: T[], propertyName: string): T[]; <T_4>(list: Dictionary<T_4>, propertyName: string): T_4[]; }
+>sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T_2>(list: Dictionary<T_2>, iterator: Iterator_<T_2, any>, context?: any): T_2[]; <T>(list: T[], propertyName: string): T[]; <T_3>(list: Dictionary<T_3>, propertyName: string): T_3[]; }
 >list : T[]
 >propertyName : string
 
         sortBy<T>(list: Dictionary<T>, propertyName: string): T[];
->sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T_2>(list: Dictionary<T_2>, iterator: Iterator_<T_2, any>, context?: any): T_2[]; <T_3>(list: T_3[], propertyName: string): T_3[]; <T_4>(list: Dictionary<T>, propertyName: string): T[]; }
+>sortBy : { <T_1>(list: T_1[], iterator: Iterator_<T_1, any>, context?: any): T_1[]; <T_2>(list: Dictionary<T_2>, iterator: Iterator_<T_2, any>, context?: any): T_2[]; <T_3>(list: T_3[], propertyName: string): T_3[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
 >list : Dictionary<T>
 >propertyName : string
 
@@ -3647,18 +3647,18 @@ module Underscore {
 >context : any
 
         groupBy<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>;
->groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T_3>(list: T_3[], propertyName: string): Dictionary<T_3[]>; <T_4>(list: Dictionary<T_4>, propertyName: string): Dictionary<T_4[]>; }
+>groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<T[]>; <T_2>(list: T_2[], propertyName: string): Dictionary<T_2[]>; <T_3>(list: Dictionary<T_3>, propertyName: string): Dictionary<T_3[]>; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, any>
 >context : any
 
         groupBy<T>(list: T[], propertyName: string): Dictionary<T[]>;
->groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<T_2[]>; <T_3>(list: T[], propertyName: string): Dictionary<T[]>; <T_4>(list: Dictionary<T_4>, propertyName: string): Dictionary<T_4[]>; }
+>groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<T_2[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T_3>(list: Dictionary<T_3>, propertyName: string): Dictionary<T_3[]>; }
 >list : T[]
 >propertyName : string
 
         groupBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>;
->groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<T_2[]>; <T_3>(list: T_3[], propertyName: string): Dictionary<T_3[]>; <T_4>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
+>groupBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<T_1[]>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<T_2[]>; <T_3>(list: T_3[], propertyName: string): Dictionary<T_3[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
 >list : Dictionary<T>
 >propertyName : string
 
@@ -3669,18 +3669,18 @@ module Underscore {
 >context : any
 
         countBy<T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>;
->countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T_2>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T_3>(list: T_3[], propertyName: string): Dictionary<number>; <T_4>(list: Dictionary<T_4>, propertyName: string): Dictionary<number>; }
+>countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator_<T, any>, context?: any): Dictionary<number>; <T_2>(list: T_2[], propertyName: string): Dictionary<number>; <T_3>(list: Dictionary<T_3>, propertyName: string): Dictionary<number>; }
 >list : Dictionary<T>
 >iterator : Iterator_<T, any>
 >context : any
 
         countBy<T>(list: T[], propertyName: string): Dictionary<number>;
->countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<number>; <T_3>(list: T[], propertyName: string): Dictionary<number>; <T_4>(list: Dictionary<T_4>, propertyName: string): Dictionary<number>; }
+>countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T_3>(list: Dictionary<T_3>, propertyName: string): Dictionary<number>; }
 >list : T[]
 >propertyName : string
 
         countBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<number>;
->countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<number>; <T_3>(list: T_3[], propertyName: string): Dictionary<number>; <T_4>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
+>countBy : { <T_1>(list: T_1[], iterator?: Iterator_<T_1, any>, context?: any): Dictionary<number>; <T_2>(list: Dictionary<T_2>, iterator?: Iterator_<T_2, any>, context?: any): Dictionary<number>; <T_3>(list: T_3[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
 >list : Dictionary<T>
 >propertyName : string
 
@@ -3689,7 +3689,7 @@ module Underscore {
 >list : T[]
 
         shuffle<T>(list: Dictionary<T>): T[];
->shuffle : { <T_1>(list: T_1[]): T_1[]; <T_2>(list: Dictionary<T>): T[]; }
+>shuffle : { <T_1>(list: T_1[]): T_1[]; <T>(list: Dictionary<T>): T[]; }
 >list : Dictionary<T>
 
         toArray<T>(list: T[]): T[];
@@ -3697,7 +3697,7 @@ module Underscore {
 >list : T[]
 
         toArray<T>(list: Dictionary<T>): T[];
->toArray : { <T_1>(list: T_1[]): T_1[]; <T_2>(list: Dictionary<T>): T[]; }
+>toArray : { <T_1>(list: T_1[]): T_1[]; <T>(list: Dictionary<T>): T[]; }
 >list : Dictionary<T>
 
         size<T>(list: T[]): number;
@@ -3705,7 +3705,7 @@ module Underscore {
 >list : T[]
 
         size<T>(list: Dictionary<T>): number;
->size : { <T_1>(list: T_1[]): number; <T_2>(list: Dictionary<T>): number; }
+>size : { <T_1>(list: T_1[]): number; <T>(list: Dictionary<T>): number; }
 >list : Dictionary<T>
 
         first<T>(list: T[]): T;
@@ -3713,7 +3713,7 @@ module Underscore {
 >list : T[]
 
         first<T>(list: T[], count: number): T[];
->first : { <T_1>(list: T_1[]): T_1; <T_2>(list: T[], count: number): T[]; }
+>first : { <T_1>(list: T_1[]): T_1; <T>(list: T[], count: number): T[]; }
 >list : T[]
 >count : number
 
@@ -3722,7 +3722,7 @@ module Underscore {
 >list : T[]
 
         head<T>(list: T[], count: number): T[];
->head : { <T_1>(list: T_1[]): T_1; <T_2>(list: T[], count: number): T[]; }
+>head : { <T_1>(list: T_1[]): T_1; <T>(list: T[], count: number): T[]; }
 >list : T[]
 >count : number
 
@@ -3731,7 +3731,7 @@ module Underscore {
 >list : T[]
 
         take<T>(list: T[], count: number): T[];
->take : { <T_1>(list: T_1[]): T_1; <T_2>(list: T[], count: number): T[]; }
+>take : { <T_1>(list: T_1[]): T_1; <T>(list: T[], count: number): T[]; }
 >list : T[]
 >count : number
 
@@ -3740,7 +3740,7 @@ module Underscore {
 >list : T[]
 
         initial<T>(list: T[], count: number): T[];
->initial : { <T_1>(list: T_1[]): T_1; <T_2>(list: T[], count: number): T[]; }
+>initial : { <T_1>(list: T_1[]): T_1; <T>(list: T[], count: number): T[]; }
 >list : T[]
 >count : number
 
@@ -3749,7 +3749,7 @@ module Underscore {
 >list : T[]
 
         last<T>(list: T[], count: number): T[];
->last : { <T_1>(list: T_1[]): T_1; <T_2>(list: T[], count: number): T[]; }
+>last : { <T_1>(list: T_1[]): T_1; <T>(list: T[], count: number): T[]; }
 >list : T[]
 >count : number
 
@@ -3767,7 +3767,7 @@ module Underscore {
 >list : T[][]
 
         flatten<T>(array: any[], shallow?: boolean): T[];
->flatten : { <T_1>(list: T_1[][]): T_1[]; <T_2>(array: any[], shallow?: boolean): T[]; }
+>flatten : { <T_1>(list: T_1[][]): T_1[]; <T>(array: any[], shallow?: boolean): T[]; }
 >array : any[]
 >shallow : boolean
 
@@ -3795,7 +3795,7 @@ module Underscore {
 >isSorted : boolean
 
         uniq<T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
->uniq : { <T_1>(list: T_1[], isSorted?: boolean): T_1[]; <T_2, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
+>uniq : { <T_1>(list: T_1[], isSorted?: boolean): T_1[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
 >list : T[]
 >isSorted : boolean
 >iterator : Iterator_<T, U>
@@ -3807,7 +3807,7 @@ module Underscore {
 >isSorted : boolean
 
         unique<T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[];
->unique : { <T_1>(list: T_1[], isSorted?: boolean): T_1[]; <T_2, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
+>unique : { <T_1>(list: T_1[], isSorted?: boolean): T_1[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator_<T, U>, context?: any): U[]; }
 >list : T[]
 >isSorted : boolean
 >iterator : Iterator_<T, U>
@@ -3819,13 +3819,13 @@ module Underscore {
 >a1 : T1[]
 
         zip<T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[];
->zip : { <T0_1, T1_1>(a0: T0_1[], a1: T1_1[]): Tuple2<T0_1, T1_1>[]; <T0_2, T1_2, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0_3, T1_3, T2_1, T3>(a0: T0_3[], a1: T1_3[], a2: T2_1[], a3: T3[]): Tuple4<T0_3, T1_3, T2_1, T3>[]; (...arrays: any[][]): any[][]; }
+>zip : { <T0_1, T1_1>(a0: T0_1[], a1: T1_1[]): Tuple2<T0_1, T1_1>[]; <T0, T1, T2>(a0: T0[], a1: T1[], a2: T2[]): Tuple3<T0, T1, T2>[]; <T0_2, T1_2, T2_1, T3>(a0: T0_2[], a1: T1_2[], a2: T2_1[], a3: T3[]): Tuple4<T0_2, T1_2, T2_1, T3>[]; (...arrays: any[][]): any[][]; }
 >a0 : T0[]
 >a1 : T1[]
 >a2 : T2[]
 
         zip<T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[];
->zip : { <T0_1, T1_1>(a0: T0_1[], a1: T1_1[]): Tuple2<T0_1, T1_1>[]; <T0_2, T1_2, T2_1>(a0: T0_2[], a1: T1_2[], a2: T2_1[]): Tuple3<T0_2, T1_2, T2_1>[]; <T0_3, T1_3, T2_2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
+>zip : { <T0_1, T1_1>(a0: T0_1[], a1: T1_1[]): Tuple2<T0_1, T1_1>[]; <T0_2, T1_2, T2_1>(a0: T0_2[], a1: T1_2[], a2: T2_1[]): Tuple3<T0_2, T1_2, T2_1>[]; <T0, T1, T2, T3>(a0: T0[], a1: T1[], a2: T2[], a3: T3[]): Tuple4<T0, T1, T2, T3>[]; (...arrays: any[][]): any[][]; }
 >a0 : T0[]
 >a1 : T1[]
 >a2 : T2[]
@@ -3863,7 +3863,7 @@ module Underscore {
 >propertyName : string
 
         sortedIndex<T>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number;
->sortedIndex : { <T_1>(list: T_1[], obj: T_1, propertyName: string): number; <T_2>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
+>sortedIndex : { <T_1>(list: T_1[], obj: T_1, propertyName: string): number; <T>(list: T[], obj: T, iterator?: Iterator_<T, any>, context?: any): number; }
 >list : T[]
 >obj : T
 >iterator : Iterator_<T, any>
diff --git a/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types b/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
index 21c45aa7c33fd..55af55a808723 100644
--- a/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
+++ b/tests/baselines/reference/unusedTypeParametersCheckedByNoUnusedParameters.types
@@ -18,6 +18,6 @@ class C<T> {
 };
 
 let l = <T>() => { };
->l : <T_1>() => void
-><T>() => { } : <T_1>() => void
+>l : <T>() => void
+><T>() => { } : <T>() => void
 
diff --git a/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types b/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
index 4dcbe8e82e0fe..e21a6f2b7f3f0 100644
--- a/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
+++ b/tests/baselines/reference/unusedTypeParametersNotCheckedByNoUnusedLocals.types
@@ -18,6 +18,6 @@ class C<T> {
 };
 
 let l = <T>() => { };
->l : <T_1>() => void
-><T>() => { } : <T_1>() => void
+>l : <T>() => void
+><T>() => { } : <T>() => void
 
diff --git a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
index a5863bebec99e..fcb1942c1b5f7 100644
--- a/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
+++ b/tests/baselines/reference/variableDeclaratorResolvedDuringContextualTyping.types
@@ -105,7 +105,7 @@ module WinJS {
 >progress : ProgressCallback
 
         public then<U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>;
->then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U_2>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U_3>(success?: (value: V) => U_3, error?: (err: any) => TPromise<U_3>, progress?: ProgressCallback): TPromise<U_3>; <U_4>(success?: (value: V) => U_4, error?: (err: any) => U_4, progress?: ProgressCallback): TPromise<U_4>; }
+>then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U>(success?: (value: V) => TPromise<U>, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; <U_2>(success?: (value: V) => U_2, error?: (err: any) => TPromise<U_2>, progress?: ProgressCallback): TPromise<U_2>; <U_3>(success?: (value: V) => U_3, error?: (err: any) => U_3, progress?: ProgressCallback): TPromise<U_3>; }
 >success : (value: V) => TPromise<U>
 >value : V
 >error : (err: any) => U
@@ -113,7 +113,7 @@ module WinJS {
 >progress : ProgressCallback
 
         public then<U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>;
->then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U_2>(success?: (value: V) => TPromise<U_2>, error?: (err: any) => U_2, progress?: ProgressCallback): TPromise<U_2>; <U_3>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U_4>(success?: (value: V) => U_4, error?: (err: any) => U_4, progress?: ProgressCallback): TPromise<U_4>; }
+>then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U_2>(success?: (value: V) => TPromise<U_2>, error?: (err: any) => U_2, progress?: ProgressCallback): TPromise<U_2>; <U>(success?: (value: V) => U, error?: (err: any) => TPromise<U>, progress?: ProgressCallback): TPromise<U>; <U_3>(success?: (value: V) => U_3, error?: (err: any) => U_3, progress?: ProgressCallback): TPromise<U_3>; }
 >success : (value: V) => U
 >value : V
 >error : (err: any) => TPromise<U>
@@ -121,7 +121,7 @@ module WinJS {
 >progress : ProgressCallback
 
         public then<U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>;
->then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U_2>(success?: (value: V) => TPromise<U_2>, error?: (err: any) => U_2, progress?: ProgressCallback): TPromise<U_2>; <U_3>(success?: (value: V) => U_3, error?: (err: any) => TPromise<U_3>, progress?: ProgressCallback): TPromise<U_3>; <U_4>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
+>then : { <U_1>(success?: (value: V) => TPromise<U_1>, error?: (err: any) => TPromise<U_1>, progress?: ProgressCallback): TPromise<U_1>; <U_2>(success?: (value: V) => TPromise<U_2>, error?: (err: any) => U_2, progress?: ProgressCallback): TPromise<U_2>; <U_3>(success?: (value: V) => U_3, error?: (err: any) => TPromise<U_3>, progress?: ProgressCallback): TPromise<U_3>; <U>(success?: (value: V) => U, error?: (err: any) => U, progress?: ProgressCallback): TPromise<U>; }
 >success : (value: V) => U
 >value : V
 >error : (err: any) => U
diff --git a/tests/baselines/reference/variadicTuples1.types b/tests/baselines/reference/variadicTuples1.types
index 73a28336eb9a7..fac1b78db51fc 100644
--- a/tests/baselines/reference/variadicTuples1.types
+++ b/tests/baselines/reference/variadicTuples1.types
@@ -1328,7 +1328,7 @@ declare function f22<T extends unknown[] = []>(args: [...T, number]): T;
 >args : [...T, number]
 
 declare function f22<T extends unknown[] = []>(args: [...T]): T;
->f22 : { <T_1 extends unknown[] = []>(args: [...T_1, number]): T_1; <T_2 extends unknown[] = []>(args: [...T]): T; }
+>f22 : { <T_1 extends unknown[] = []>(args: [...T_1, number]): T_1; <T extends unknown[] = []>(args: [...T]): T; }
 >args : [...T]
 
 function f23<U extends string[]>(args: [...U, number]) {
diff --git a/tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts b/tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts
new file mode 100644
index 0000000000000..7c7058030f90f
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitReusesLambdaParameterNodes.ts
@@ -0,0 +1,12 @@
+// @strict: true
+// @declaration: true
+// @module: nodenext
+// @filename: node_modules/react-select/index.d.ts
+export type Whatever = {x: string, y: number};
+export type Props<T, TThing = Whatever> = Omit<TThing, "y"> & Partial<TThing> & T;
+
+// @filename: index.ts
+import { Props } from "react-select";
+
+export const CustomSelect1 = <Option,>(x: Props<Option> & {}) => {}
+export function CustomSelect2<Option,>(x: Props<Option> & {}) {}
diff --git a/tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts b/tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts
new file mode 100644
index 0000000000000..10e18f43d4d84
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeParameterNameInOuterScope.ts
@@ -0,0 +1,16 @@
+// @declaration: true
+// @skipLibCheck: false
+
+class A { }
+
+var a = <A,>(x: A) => x;
+function a2<A,>(x: A) { return x }
+
+var a3 = <A,>(x: A) => new A();
+function a4<A,>(x: A) { return new A() }
+
+
+interface B { }
+
+var b = <B,>(x: B) => x;
+function b2<B,>(x: B) { return x }
diff --git a/tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts b/tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts
new file mode 100644
index 0000000000000..a30b54eef5adc
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeParameterNameReusedInOverloads.ts
@@ -0,0 +1,17 @@
+// @declaration: true
+// @skipLibCheck: false
+
+export class Base { foo: string; }
+export class Derived extends Base { bar: string; }
+export class Derived2 extends Derived { baz: string; }
+
+export type Foo = {
+    new (x: {
+        new <T extends Derived>(a: T): T;
+        new <T extends Base>(a: T): T;
+    }): any[];
+    new (x: {
+        new <T extends Derived2>(a: T): T;
+            new <T extends Base>(a: T): T;
+    }): any[];
+}
diff --git a/tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts b/tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts
new file mode 100644
index 0000000000000..2c0b6bffd7fe8
--- /dev/null
+++ b/tests/cases/compiler/declarationEmitTypeParameterNameShadowedInternally.ts
@@ -0,0 +1,7 @@
+// @declaration: true
+// @skipLibCheck: false
+
+export const foo = <T,>(x: T) => {
+	const inner = <T,>(y: T) => [x, y] as const;
+	return inner;
+}