diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 938d4987276..ef3d67ddb0e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6773,19 +6773,19 @@ module ts {
                 (<QualifiedName>node.parent).right === node;
         }
 
-        function getSymbolOfIdentifier(identifier: Identifier) {
-            if (isDeclarationOrFunctionExpressionOrCatchVariableName(identifier)) {
-                return getSymbolOfNode(identifier.parent);
+        function getSymbolOfEntityName(entityName: EntityName): Symbol {
+            if (isDeclarationOrFunctionExpressionOrCatchVariableName(entityName)) {
+                return getSymbolOfNode(entityName.parent);
             }
 
-            if (identifier.parent.kind === SyntaxKind.ExportAssignment) {
-                return resolveEntityName(/*location*/ identifier.parent.parent, identifier,
+            if (entityName.parent.kind === SyntaxKind.ExportAssignment) {
+                return resolveEntityName(/*location*/ entityName.parent.parent, entityName,
                     /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Import);
             }
 
-            var entityName: Node = identifier;
-            while (isRightSideOfQualifiedNameOrPropertyAccess(entityName))
+            if (isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
+            }
 
             if (isExpression(entityName)) {
                 if (entityName.kind === SyntaxKind.Identifier) {
@@ -6813,12 +6813,17 @@ module ts {
                 meaning |= SymbolFlags.Import;
                 return resolveEntityName(entityName, entityName, meaning);
             }
+
+            // Do we want to return undefined here?
+            return undefined;
         }
 
         function getSymbolInfo(node: Node) {
             switch (node.kind) {
                 case SyntaxKind.Identifier:
-                    return getSymbolOfIdentifier(<Identifier>node);
+                case SyntaxKind.PropertyAccess:
+                case SyntaxKind.QualifiedName:
+                    return getSymbolOfEntityName(<Identifier>node);
 
                 case SyntaxKind.ThisKeyword:
                 case SyntaxKind.SuperKeyword:
@@ -6894,10 +6899,12 @@ module ts {
                 }
                 else {
                     // It is an import statement
-                    while (node.kind !== SyntaxKind.ImportDeclaration) {
+                    if (isRightSideOfQualifiedNameOrPropertyAccess(node)) {
                         node = node.parent;
                     }
-                    symbol = getSymbolOfNode(node);
+                    // We include all declaration spaces for aliases. This is likely too inclusive, as the rules
+                    // for resolving aliases are quite particular. Ideally this should reuse the logic in resolveAlias.
+                    symbol = resolveEntityName(node, node, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Import);
                 }
                 var declaredType = getDeclaredTypeOfSymbol(symbol);
                 return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index 238026d64ff..6f4452fce4c 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -50,7 +50,7 @@ module A {
 >fromorigin2d : (p: Point) => Line<Point>
 >p : Point
 >Point : Point
->Line : Line
+>Line : Line<TPoint>
 >Point : Point
 
             return null;
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
index e7624436819..46084e85632 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
@@ -11,7 +11,7 @@ module A {
 
     export var beez: Array<B>;
 >beez : B[]
->Array : Array
+>Array : T[]
 >B : B
 
     export var beez2 = new Array<B>();
diff --git a/tests/baselines/reference/acceptableAlias1.types b/tests/baselines/reference/acceptableAlias1.types
index a73e416a11c..3375ceee302 100644
--- a/tests/baselines/reference/acceptableAlias1.types
+++ b/tests/baselines/reference/acceptableAlias1.types
@@ -12,6 +12,6 @@ module M {
 
 import r = M.X;
 >r : r
->M : M
+>M : typeof M
 >X : X
 
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index 808a1d7e83b..d66878258f8 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -24,7 +24,7 @@ class C<T extends IHasVisualizationModel> {
 }
 class D extends C<IHasVisualizationModel> {
 >D : D
->C : C
+>C : C<T>
 >IHasVisualizationModel : IHasVisualizationModel
 
     x = moduleA;
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
index a3d30f3d03c..affce41c42e 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
@@ -5,7 +5,7 @@ import foo = require("./foo_0");
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
 >f : f
->foo : foo
+>foo : typeof "tests/cases/conformance/externalModules/foo_0"
 >M1 : M1
 
 var i: f.I2;
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index f80d66f7eaa..f5a4f22ef3f 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -167,8 +167,8 @@ class A2<T> { foo: T; }
 declare function foo11(x: A2<string>): A2<string>;
 >foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
 >x : A2<string>
->A2 : A2
->A2 : A2
+>A2 : A2<T>
+>A2 : A2<T>
 
 declare function foo11(x: any): any;
 >foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 099847793b7..29dd1b19970 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -78,7 +78,7 @@ var classTypeArray = [C, C, C];
 
 var classTypeArray: Array<typeof C>; // Should OK, not be a parse error
 >classTypeArray : typeof C[]
->Array : Array
+>Array : T[]
 >C : typeof C
 
 // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[]
@@ -111,7 +111,7 @@ var context2 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }];
 
 var context2: Array<{}>; // Should be OK
 >context2 : {}[]
->Array : Array
+>Array : T[]
 
 // Contextual type C with numeric index signature of type Base makes array literal of Derived have type Base[]
 class Base { private p; }
diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
index 2c6e482e49d..becff7617b7 100644
--- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
+++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.types
@@ -9,15 +9,15 @@ class List<T> {
 
     next: List<List<T>>;
 >next : List<List<T>>
->List : List
->List : List
+>List : List<T>
+>List : List<T>
 >T : T
 }
 
 class DerivedList<U> extends List<U> {
 >DerivedList : DerivedList<U>
 >U : U
->List : List
+>List : List<T>
 >U : U
 
     foo: U;
@@ -37,22 +37,22 @@ class MyList<T> {
 
     next: MyList<MyList<T>>;
 >next : MyList<MyList<T>>
->MyList : MyList
->MyList : MyList
+>MyList : MyList<T>
+>MyList : MyList<T>
 >T : T
 }
 
 var list: List<number>;
 >list : List<number>
->List : List
+>List : List<T>
 
 var list2: List<string>;
 >list2 : List<string>
->List : List
+>List : List<T>
 
 var myList: MyList<number>;
 >myList : MyList<number>
->MyList : MyList
+>MyList : MyList<T>
 
 var xs = [list, myList]; // {}[]
 >xs : List<number>[]
@@ -73,7 +73,7 @@ var zs = [list, null]; // List<number>[]
 
 var myDerivedList: DerivedList<number>;
 >myDerivedList : DerivedList<number>
->DerivedList : DerivedList
+>DerivedList : DerivedList<U>
 
 var as = [list, myDerivedList]; // List<number>[]
 >as : List<number>[]
diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
index 7f1523a6870..5425ccf9344 100644
--- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
+++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
@@ -12,15 +12,15 @@ declare module WinJS {
 >success : (value: T) => Promise<U>
 >value : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 >error : (error: any) => Promise<U>
 >error : any
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Promise : Promise
+>Promise : Promise<T>
 >U : U
     }
 }
@@ -66,14 +66,14 @@ declare module Data {
 >indices : number[]
 >options : any
 >WinJS : WinJS
->Promise : Promise
->IListItem : IListItem
+>Promise : Promise<T>
+>IListItem : IListItem<T>
 >T : T
     }
     export class VirtualList<T> implements IVirtualList<T> {
 >VirtualList : VirtualList<T>
 >T : T
->IVirtualList : IVirtualList
+>IVirtualList : IVirtualList<T>
 >T : T
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
@@ -82,8 +82,8 @@ declare module Data {
 >indices : number[]
 >options : any
 >WinJS : WinJS
->Promise : Promise
->IListItem : IListItem
+>Promise : Promise<T>
+>IListItem : IListItem<T>
 >T : T
     }
 }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 39bdbced7b1..72cceae84ff 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -106,23 +106,23 @@ var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var a14: (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ b11 = a11; // ok
 var b12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ b12 = a12; // ok
 var b13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index aeefd4dee02..807f31b0e6e 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -106,23 +106,23 @@ var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var a14: new (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ b11 = a11; // ok
 var b12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; 
 >b12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ b12 = a12; // ok
 var b13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; 
 >b13 : new <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
index dc1912cd7a1..0e2eec9c02d 100644
--- a/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithGenericCallSignatures3.types
@@ -25,7 +25,7 @@ var g: <T>(x: T) => <S>(y: S) => I<T, S>
 >S : S
 >y : S
 >S : S
->I : I
+>I : I<T, S>
 >T : T
 >S : S
 
diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types
index f03d33dc04b..43f2466f48b 100644
--- a/tests/baselines/reference/assignmentCompatability1.types
+++ b/tests/baselines/reference/assignmentCompatability1.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types
index 75605a498e8..5e27bf37521 100644
--- a/tests/baselines/reference/assignmentCompatability2.types
+++ b/tests/baselines/reference/assignmentCompatability2.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types
index c302d2d5465..94676fbfbe1 100644
--- a/tests/baselines/reference/assignmentCompatability3.types
+++ b/tests/baselines/reference/assignmentCompatability3.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types
index 2090d850c28..89281dae988 100644
--- a/tests/baselines/reference/assignmentCompatability4.types
+++ b/tests/baselines/reference/assignmentCompatability4.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types
index 9cfcfbcda2f..e5d69b4a6a4 100644
--- a/tests/baselines/reference/assignmentCompatability5.types
+++ b/tests/baselines/reference/assignmentCompatability5.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
@@ -28,7 +28,7 @@ module __test2__ {
 >one : T
 >T : T
 >obj1 : interfaceOne<number>
->interfaceOne : interfaceOne
+>interfaceOne : interfaceOne<T>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types
index 1e22958db09..d7662f0bb2c 100644
--- a/tests/baselines/reference/assignmentCompatability6.types
+++ b/tests/baselines/reference/assignmentCompatability6.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
@@ -28,7 +28,7 @@ module __test2__ {
 >one : T
 >T : T
 >obj3 : interfaceWithOptional<number>
->interfaceWithOptional : interfaceWithOptional
+>interfaceWithOptional : interfaceWithOptional<T>
 >{ } : {}
 
     export var __val__obj3 = obj3;
diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types
index feaa1567dd1..e48e164aa55 100644
--- a/tests/baselines/reference/assignmentCompatability7.types
+++ b/tests/baselines/reference/assignmentCompatability7.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
@@ -31,7 +31,7 @@ module __test2__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types
index 37bbd18d7bf..581ad05c5a2 100644
--- a/tests/baselines/reference/assignmentCompatability8.types
+++ b/tests/baselines/reference/assignmentCompatability8.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types
index 5add8208d80..d71cb54e225 100644
--- a/tests/baselines/reference/assignmentCompatability9.types
+++ b/tests/baselines/reference/assignmentCompatability9.types
@@ -11,7 +11,7 @@ module __test1__ {
 >two : U
 >U : U
 >obj4 : interfaceWithPublicAndOptional<number, string>
->interfaceWithPublicAndOptional : interfaceWithPublicAndOptional
+>interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
 >{ one: 1 } : { one: number; }
 >one : number
 
diff --git a/tests/baselines/reference/baseIndexSignatureResolution.types b/tests/baselines/reference/baseIndexSignatureResolution.types
index bdaf9d50a19..5a7ad14d2fa 100644
--- a/tests/baselines/reference/baseIndexSignatureResolution.types
+++ b/tests/baselines/reference/baseIndexSignatureResolution.types
@@ -28,7 +28,7 @@ interface FooOf<TBase extends Base> extends Foo {
 }
 var x: FooOf<Derived> = null;
 >x : FooOf<Derived>
->FooOf : FooOf
+>FooOf : FooOf<TBase>
 >Derived : Derived
 
 var y: Derived = x[0];
diff --git a/tests/baselines/reference/baseTypeOrderChecking.types b/tests/baselines/reference/baseTypeOrderChecking.types
index 201b82d9375..4193f255f36 100644
--- a/tests/baselines/reference/baseTypeOrderChecking.types
+++ b/tests/baselines/reference/baseTypeOrderChecking.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/baseTypeOrderChecking.ts ===
 var someVariable: Class4<Class2>;
 >someVariable : Class4<Class2>
->Class4 : Class4
+>Class4 : Class4<T>
 >Class2 : Class2
 
  
@@ -42,7 +42,7 @@ class Class3<T>
 class Class4<T> extends Class3<T>
 >Class4 : Class4<T>
 >T : T
->Class3 : Class3
+>Class3 : Class3<T>
 >T : T
 
 {
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.types b/tests/baselines/reference/bestCommonTypeReturnStatement.types
index e1b99339036..3c260ea709b 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.types
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.types
@@ -10,7 +10,7 @@ interface IPromise<T> {
 >T : T
 >errorCallback : (reason: any) => any
 >reason : any
->IPromise : IPromise
+>IPromise : IPromise<T>
 }
 
 function f() {
@@ -28,9 +28,9 @@ function f() {
 
 function b(): IPromise<void> { return null; }
 >b : () => IPromise<void>
->IPromise : IPromise
+>IPromise : IPromise<T>
 
 function d(): IPromise<any> { return null; }
 >d : () => IPromise<any>
->IPromise : IPromise
+>IPromise : IPromise<T>
 
diff --git a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
index 54752a853c9..6349114bffe 100644
--- a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -12,7 +12,7 @@ interface I<T> {
 }
 var i: I<string>;
 >i : I<string>
->I : I
+>I : I<T>
 
 var y = i(""); // y should be string
 >y : string
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
index 14759564b01..34de901e3c0 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
@@ -115,7 +115,7 @@ interface I2<T> {
 }
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2
+>I2 : I2<T>
 
 var r7 = i2.f(1);
 >r7 : number
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index d5886bd5ef8..335413cd73e 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
index 500646a189f..0ffc8257a56 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     a12: <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/callbacksDontShareTypes.types b/tests/baselines/reference/callbacksDontShareTypes.types
index b0ced875b67..39ff5d8e306 100644
--- a/tests/baselines/reference/callbacksDontShareTypes.types
+++ b/tests/baselines/reference/callbacksDontShareTypes.types
@@ -24,25 +24,25 @@ interface Combinators {
 >T : T
 >U : U
 >c : Collection<T>
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 >f : (x: T) => U
 >x : T
 >T : T
 >U : U
->Collection : Collection
+>Collection : Collection<T>
 >U : U
 
     map<T>(c: Collection<T>, f: (x: T) => any): Collection<any>;
 >map : { <T, U>(c: Collection<T>, f: (x: T) => U): Collection<U>; <T>(c: Collection<T>, f: (x: T) => any): Collection<any>; }
 >T : T
 >c : Collection<T>
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 >f : (x: T) => any
 >x : T
 >T : T
->Collection : Collection
+>Collection : Collection<T>
 }
 
 var _: Combinators;
@@ -51,7 +51,7 @@ var _: Combinators;
 
 var c2: Collection<number>;
 >c2 : Collection<number>
->Collection : Collection
+>Collection : Collection<T>
 
 var rf1 = (x: number) => { return x.toFixed() };
 >rf1 : (x: number) => string
diff --git a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
index 08fd92fbdc7..b76b19a724d 100644
--- a/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
+++ b/tests/baselines/reference/chainedSpecializationToObjectTypeLiteral.types
@@ -16,7 +16,7 @@ interface Sequence<T> {
 >value : T
 >T : T
 >U : U
->Sequence : Sequence
+>Sequence : Sequence<T>
 >U : U
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
@@ -24,7 +24,7 @@ interface Sequence<T> {
 >iterator : (value: T) => boolean
 >value : T
 >T : T
->Sequence : Sequence
+>Sequence : Sequence<T>
 >T : T
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: T[]; }>;
@@ -34,7 +34,7 @@ interface Sequence<T> {
 >value : T
 >T : T
 >K : K
->Sequence : Sequence
+>Sequence : Sequence<T>
 >key : K
 >K : K
 >items : T[]
@@ -43,7 +43,7 @@ interface Sequence<T> {
 
 var s: Sequence<string>;
 >s : Sequence<string>
->Sequence : Sequence
+>Sequence : Sequence<T>
 
 var s2 = s.groupBy(s => s.length);
 >s2 : Sequence<{ key: number; items: string[]; }>
diff --git a/tests/baselines/reference/classExtendingClass.types b/tests/baselines/reference/classExtendingClass.types
index 837adaf50fd..7eaaaecf17f 100644
--- a/tests/baselines/reference/classExtendingClass.types
+++ b/tests/baselines/reference/classExtendingClass.types
@@ -73,7 +73,7 @@ class C2<T> {
 class D2<T> extends C2<T> {
 >D2 : D2<T>
 >T : T
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     bar: string;
@@ -82,7 +82,7 @@ class D2<T> extends C2<T> {
 
 var d2: D2<string>;
 >d2 : D2<string>
->D2 : D2
+>D2 : D2<T>
 
 var r5 = d2.foo;
 >r5 : string
diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types
index 90944455ee1..ef02896a945 100644
--- a/tests/baselines/reference/classImplementsImportedInterface.types
+++ b/tests/baselines/reference/classImplementsImportedInterface.types
@@ -15,12 +15,12 @@ module M2 {
 
     import T = M1.I;
 >T : T
->M1 : I
+>M1 : M1
 >I : I
 
     class C implements T {
 >C : C
->T : T
+>T : I
 
         foo() {}
 >foo : () => void
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.types b/tests/baselines/reference/cloduleAndTypeParameters.types
index 63c80a44f18..dc4d6579467 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.types
+++ b/tests/baselines/reference/cloduleAndTypeParameters.types
@@ -2,7 +2,7 @@
 class Foo<T extends Foo.Bar> {
 >Foo : Foo<T>
 >T : T
->Foo : Foo
+>Foo : Foo<T>
 >Bar : Bar
 
   constructor() {
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
index a3d30f3d03c..affce41c42e 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
@@ -5,7 +5,7 @@ import foo = require("./foo_0");
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
 >f : f
->foo : foo
+>foo : typeof "tests/cases/conformance/externalModules/foo_0"
 >M1 : M1
 
 var i: f.I2;
diff --git a/tests/baselines/reference/complexClassRelationships.types b/tests/baselines/reference/complexClassRelationships.types
index 850ae5fa1d7..69bee9caade 100644
--- a/tests/baselines/reference/complexClassRelationships.types
+++ b/tests/baselines/reference/complexClassRelationships.types
@@ -41,7 +41,7 @@ class Base {
 
     ownerCollection: BaseCollection<Base>;
 >ownerCollection : BaseCollection<Base>
->BaseCollection : BaseCollection
+>BaseCollection : BaseCollection<T>
 >Base : Base
 }
 
@@ -50,7 +50,7 @@ class Thing {
 
     public get Components(): ComponentCollection<any> { return null }
 >Components : ComponentCollection<any>
->ComponentCollection : ComponentCollection
+>ComponentCollection : ComponentCollection<T>
 }
 
 class ComponentCollection<T> {
@@ -90,7 +90,7 @@ class Foo {
     }
     public get prop2(): BaseCollection<Derived> {
 >prop2 : BaseCollection<Derived>
->BaseCollection : BaseCollection
+>BaseCollection : BaseCollection<T>
 >Derived : Derived
 
         return new BaseCollection<Derived>(Derived.createEmpty);
diff --git a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
index 25504880a2a..1d94a5e464c 100644
--- a/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
+++ b/tests/baselines/reference/constraintCheckInGenericBaseTypeReference.types
@@ -16,7 +16,7 @@ class GenericBase<T extends Constraint> {
 }
 class Derived extends GenericBase<TypeArg> {
 >Derived : Derived
->GenericBase : GenericBase
+>GenericBase : GenericBase<T>
 >TypeArg : TypeArg
 
 }
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
index 01a7278be31..113736bdd11 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
@@ -52,7 +52,7 @@ interface I<T extends Object> {
 }
 var i: I<{}>;
 >i : I<{}>
->I : I
+>I : I<T>
 
 // {} constraint
 function foo2<T extends {}>(x: T) { }
@@ -102,6 +102,6 @@ interface I2<T extends {}> {
 }
 var i2: I2<{}>;
 >i2 : I2<{}>
->I2 : I2
+>I2 : I2<T>
 
 
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 9f75c2c4426..7ab221024ca 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
index 2574298f68b..dea9478b372 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
index 9cbf379ca52..a34c5365f2d 100644
--- a/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithIdenticalOverloads.types
@@ -76,14 +76,14 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new (x: T, y: string): C2<T>; // error
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C2<T>;
@@ -91,7 +91,7 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C2<T>; // error
@@ -99,13 +99,13 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 }
 
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2
+>I2 : I2<T>
 
 var r4 = new i2(1, '');
 >r4 : C2<number>
@@ -139,7 +139,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C2<T>; // error
@@ -147,7 +147,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloads.types b/tests/baselines/reference/constructSignaturesWithOverloads.types
index e725792d251..0cd9b744ee7 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloads.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloads.types
@@ -76,14 +76,14 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new (x: T, y: string): C2<T>;
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y?: string): C2<T>;
@@ -91,7 +91,7 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C2<T>;
@@ -99,14 +99,14 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
 }
 
 var i2: I2<number>;
 >i2 : I2<number>
->I2 : I2
+>I2 : I2<T>
 
 var r4 = new i2(1, '');
 >r4 : C2<number>
@@ -140,7 +140,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new<T>(x: T, y: string): C2<T>;
@@ -148,7 +148,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
index c24ae97e34d..6e1ea33efa7 100644
--- a/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
+++ b/tests/baselines/reference/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.types
@@ -29,7 +29,7 @@ interface I {
     new(x: number, y: string): C2<number>; // error
 >x : number
 >y : string
->C2 : C2
+>C2 : C2<T>
 }
 
 interface I2<T> {
@@ -40,7 +40,7 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 
     new (x: T, y: string): C; // error
 >x : T
@@ -53,7 +53,7 @@ interface I2<T> {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C; // error
@@ -71,7 +71,7 @@ var a: {
     new (x: number, y: string): C2<number>;
 >x : number
 >y : string
->C2 : C2
+>C2 : C2<T>
 
     new (x: number, y: string): C; // error
 >x : number
@@ -87,7 +87,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C; // error
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.types b/tests/baselines/reference/constructorHasPrototypeProperty.types
index a39b95cc137..24dedb254eb 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.types
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.types
@@ -61,7 +61,7 @@ module Generic {
 >D : D<T, U>
 >T : T
 >U : U
->C : C
+>C : C<T, U>
 >T : T
 >U : U
 
diff --git a/tests/baselines/reference/crashInResolveInterface.types b/tests/baselines/reference/crashInResolveInterface.types
index 0a3e8c08366..539d50208d1 100644
--- a/tests/baselines/reference/crashInResolveInterface.types
+++ b/tests/baselines/reference/crashInResolveInterface.types
@@ -34,7 +34,7 @@ interface Q<T> {
 }
 var q1: Q<{ a: number; }>;
 >q1 : Q<{ a: number; }>
->Q : Q
+>Q : Q<T>
 >a : number
 
 var x = q1.each(x => c.log(x));
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
index ebb7af61573..b7e14978048 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
@@ -4,8 +4,8 @@ import a = require('declFileExportAssignmentOfGenericInterface_0');
 
 export var x: a<a<string>>;
 >x : Foo<Foo<string>>
->a : a
->a : a
+>a : Foo<T>
+>a : Foo<T>
 
 x.a;
 >x.a : string
diff --git a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
index 63a88b23ede..5f759fb423f 100644
--- a/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
+++ b/tests/baselines/reference/declFileForFunctionTypeAsTypeParameter.types
@@ -6,11 +6,11 @@ class X<T> {
 }
 class C extends X<() => number> {
 >C : C
->X : X
+>X : X<T>
 }
 interface I extends X<() => number> {
 >I : I
->X : X
+>X : X<T>
 }
 
 
diff --git a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
index 9b0ee715472..27fed37c21b 100644
--- a/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
+++ b/tests/baselines/reference/declFileGenericClassWithGenericExtendedClass.types
@@ -13,7 +13,7 @@ class Base<T> { }
 class Derived<T> extends Base<T> { }
 >Derived : Derived<T>
 >T : T
->Base : Base
+>Base : Base<T>
 >T : T
 
 interface IBar<T> {
@@ -22,17 +22,17 @@ interface IBar<T> {
 
     derived: Derived<T>;
 >derived : Derived<T>
->Derived : Derived
+>Derived : Derived<T>
 >T : T
 }
 class Baz implements IBar<Baz> {
 >Baz : Baz
->IBar : IBar
+>IBar : IBar<T>
 >Baz : Baz
 
     derived: Derived<Baz>;
 >derived : Derived<Baz>
->Derived : Derived
+>Derived : Derived<T>
 >Baz : Baz
 }
 
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 646e0d89e1a..1e85eef3824 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -14,7 +14,7 @@ export module C {
 >T : T
 >x : T
 >T : T
->A : A
+>A : A<T>
 >B : B
 
     export function F2<T>(x: T): C.A<C.B> { return null; }
@@ -23,7 +23,7 @@ export module C {
 >x : T
 >T : T
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
@@ -33,20 +33,20 @@ export module C {
 >x : T
 >T : T
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
     export function F4<T extends A<B>>(x: T): Array<C.A<C.B>> { return null; }
 >F4 : <T extends A<B>>(x: T) => A<B>[]
 >T : T
->A : A
+>A : A<T>
 >B : B
 >x : T
 >T : T
->Array : Array
+>Array : T[]
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
@@ -58,7 +58,7 @@ export module C {
     export function F6<T extends A<B>>(x: T): T { return null; }
 >F6 : <T extends A<B>>(x: T) => T
 >T : T
->A : A
+>A : A<T>
 >B : B
 >x : T
 >T : T
@@ -78,7 +78,7 @@ export module C {
 export var a: C.A<C.B>;
 >a : A<B>
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
@@ -115,7 +115,7 @@ export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >C : typeof C
 >D : typeof D
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 >new C.A<C.B>() : A<B>
@@ -130,7 +130,7 @@ export function f<T extends C.A<C.B>>() { }
 >f : <T extends A<B>>() => void
 >T : T
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
@@ -141,21 +141,21 @@ export var g = C.F5<C.A<C.B>>();
 >C : typeof C
 >F5 : <T>() => T
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
 export class h extends C.A<C.B>{ }
 >h : h
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
 export interface i extends C.A<C.B> { }
 >i : i
 >C : C
->A : A
+>A : A<T>
 >C : C
 >B : B
 
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index e6037eaac15..bc68a41dc1b 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -31,7 +31,7 @@ declare module templa.mvc {
 >mvc : mvc
 >IModel : IModel
 >mvc : mvc
->IController : IController
+>IController : IController<ModelType>
 >ModelType : ModelType
     }
 }
@@ -48,7 +48,7 @@ declare module templa.mvc.composite {
         getControllers(): mvc.IController<mvc.IModel>[];
 >getControllers : () => IController<IModel>[]
 >mvc : mvc
->IController : IController
+>IController : IController<ModelType>
 >mvc : mvc
 >IModel : IModel
     }
@@ -66,7 +66,7 @@ module templa.dom.mvc {
 >IModel : IModel
 >templa : templa
 >mvc : mvc
->IController : IController
+>IController : IController<ModelType>
 >ModelType : ModelType
     }
 }
@@ -84,9 +84,9 @@ module templa.dom.mvc {
 >IModel : IModel
 >templa : templa
 >mvc : mvc
->AbstractController : AbstractController
+>AbstractController : AbstractController<ModelType>
 >ModelType : ModelType
->IElementController : IElementController
+>IElementController : IElementController<ModelType>
 >ModelType : ModelType
 
         constructor() {
@@ -112,14 +112,14 @@ module templa.dom.mvc.composite {
 >templa : templa
 >dom : dom
 >mvc : mvc
->AbstractElementController : AbstractElementController
+>AbstractElementController : AbstractElementController<ModelType>
 >ModelType : ModelType
 
         public _controllers: templa.mvc.IController<templa.mvc.IModel>[];
 >_controllers : IController<IModel>[]
 >templa : templa
 >mvc : mvc
->IController : IController
+>IController : IController<ModelType>
 >templa : templa
 >mvc : mvc
 >IModel : IModel
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.types b/tests/baselines/reference/declFileImportChainInExportAssignment.types
index 267ea6b129e..9f440c231ee 100644
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.types
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.types
@@ -12,7 +12,7 @@ module m {
 }
 import a = m.c;
 >a : typeof c
->m : typeof c
+>m : typeof m
 >c : typeof c
 
 import b = a;
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
index eb9da5c2094..f7cc171ed94 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -15,7 +15,7 @@ declare module 'moo' {
 
     export var p: List<x.Foo>;
 >p : List<Foo>
->List : List
+>List : List<T>
 >x : x
 >Foo : Foo
 }
diff --git a/tests/baselines/reference/declFileInternalAliases.types b/tests/baselines/reference/declFileInternalAliases.types
index 2c50d084b9e..379d70be53d 100644
--- a/tests/baselines/reference/declFileInternalAliases.types
+++ b/tests/baselines/reference/declFileInternalAliases.types
@@ -11,7 +11,7 @@ module m1 {
 
     import x = m.c;
 >x : typeof c
->m : c
+>m : typeof m
 >c : c
 
     export var d = new x(); // emit the type as m.c
@@ -24,7 +24,7 @@ module m2 {
 
     export import x = m.c;
 >x : typeof c
->m : c
+>m : typeof m
 >c : c
 
     export var d = new x(); // emit the type as x
diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
index b68080c4082..63f35d0f263 100644
--- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
+++ b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/declarationEmit_array-types-from-generic-array-usage.ts ===
 interface A extends Array<string> { }
 >A : A
->Array : Array
+>Array : T[]
 
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
index e6ae616039d..2b6a8d21827 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -23,12 +23,12 @@ export module M {
 
     export import a = M.f;
 >a : () => void
->M : () => void
+>M : typeof M
 >f : () => void
 
     export import b = M.C;
 >b : typeof C
->M : C
+>M : typeof M
 >C : C
 
     export import c = N;
@@ -61,8 +61,8 @@ export module M.P {
     }
     export import im = M.P.f;
 >im : () => void
->M : () => void
->P : () => void
+>M : typeof M
+>P : typeof P
 >f : () => void
 
     export var a = M.a; // emitted incorrectly as typeof f
@@ -120,7 +120,7 @@ export module M.Q {
     export interface b extends M.b { } // ok
 >b : b
 >M : M
->b : b
+>b : C
 
     export interface I extends M.c.I { } // ok
 >I : I
diff --git a/tests/baselines/reference/declareDottedExtend.types b/tests/baselines/reference/declareDottedExtend.types
index 45a03ef0fbe..31f4fe01622 100644
--- a/tests/baselines/reference/declareDottedExtend.types
+++ b/tests/baselines/reference/declareDottedExtend.types
@@ -9,7 +9,7 @@ declare module A.B
 
 import ab = A.B;
 >ab : typeof B
->A : typeof B
+>A : typeof A
 >B : typeof B
 
 class D extends ab.C{ }
diff --git a/tests/baselines/reference/dependencyViaImportAlias.types b/tests/baselines/reference/dependencyViaImportAlias.types
index 3e9b453bd73..3fb8773aab5 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.types
+++ b/tests/baselines/reference/dependencyViaImportAlias.types
@@ -4,7 +4,7 @@ import a = require('A');
 
 import A = a.A;
 >A : typeof A
->a : A
+>a : typeof "tests/cases/compiler/A"
 >A : A
 
 export = A;
diff --git a/tests/baselines/reference/dottedModuleName2.types b/tests/baselines/reference/dottedModuleName2.types
index e06bcd1577f..350cb7401ec 100644
--- a/tests/baselines/reference/dottedModuleName2.types
+++ b/tests/baselines/reference/dottedModuleName2.types
@@ -63,13 +63,13 @@ module M
  
     import X2 = A.B;
 >X2 : typeof B
->A : typeof B
+>A : typeof A
 >B : typeof B
  
     import X3 = A.B.C;
 >X3 : typeof C
->A : typeof C
->B : typeof C
+>A : typeof A
+>B : typeof B
 >C : typeof C
  
 }
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
index 63351ae0b23..bc7214eb6b9 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
@@ -40,7 +40,7 @@ interface Array<T> {
 }
 var a: Array<string>;
 >a : string[]
->Array : Array
+>Array : T[]
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : string
diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types
index b0a63664993..a21f68a27ff 100644
--- a/tests/baselines/reference/duplicateVarAndImport.types
+++ b/tests/baselines/reference/duplicateVarAndImport.types
@@ -9,5 +9,5 @@ module M { }
 
 import a = M;
 >a : any
->M : any
+>M : M
 
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index e814db0463c..d0b6b1f5c42 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -160,7 +160,7 @@ interfaceType1Object1.bar1 = 2;
 var interfaceType1Object2 = <interfaceType\u0031>{ bar1: 0 };
 >interfaceType1Object2 : interfaceType1
 ><interfaceType\u0031>{ bar1: 0 } : interfaceType1
->interfaceType\u0031 : interfaceType\u0031
+>interfaceType\u0031 : interfaceType1
 >{ bar1: 0 } : { bar1: number; }
 >bar1 : number
 
@@ -173,7 +173,7 @@ interfaceType1Object2.bar1 = 2;
 var interfaceType2Object1 = <interfaceType2>{ bar2: 0 };
 >interfaceType2Object1 : interfaceType\u0032
 ><interfaceType2>{ bar2: 0 } : interfaceType\u0032
->interfaceType2 : interfaceType2
+>interfaceType2 : interfaceType\u0032
 >{ bar2: 0 } : { bar2: number; }
 >bar2 : number
 
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index 5674dd0cd0d..49f2ac2a781 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -24,13 +24,13 @@ class D<T>{
 
     recurse: D<T>;
 >recurse : D<T>
->D : D
+>D : D<T>
 >T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D
->D : D
+>D : D<T>
+>D : D<T>
 >T : T
 }
 
@@ -100,7 +100,7 @@ var aClass: C = new C();
 
 var aGenericClass: D<string> = new D<string>();
 >aGenericClass : D<string>
->D : D
+>D : D<T>
 >new D<string>() : D<string>
 >D : typeof D
 
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index 238335f8795..a721a88a5ca 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -24,13 +24,13 @@ class D<T>{
 
     recurse: D<T>;
 >recurse : D<T>
->D : D
+>D : D<T>
 >T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D
->D : D
+>D : D<T>
+>D : D<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
index 3b96628a3cc..b6cd8feb91e 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
@@ -5,7 +5,7 @@ import test = require('exportAssignedTypeAsTypeAnnotation_0');
 
 var t2: test; // should not raise a 'container type' error
 >t2 : x
->test : test
+>test : x
 
 === tests/cases/compiler/exportAssignedTypeAsTypeAnnotation_0.ts ===
 
diff --git a/tests/baselines/reference/exportAssignmentInterface.types b/tests/baselines/reference/exportAssignmentInterface.types
index 29c27090132..429a64c8029 100644
--- a/tests/baselines/reference/exportAssignmentInterface.types
+++ b/tests/baselines/reference/exportAssignmentInterface.types
@@ -4,7 +4,7 @@ import I1 = require("exportAssignmentInterface_A");
 
 var i: I1;
 >i : A
->I1 : I1
+>I1 : A
 
 var n: number = i.p1;
 >n : number
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.types b/tests/baselines/reference/exportAssignmentMergedInterface.types
index 033bc26f98e..53d80ec0434 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.types
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.types
@@ -4,7 +4,7 @@ import foo = require("./foo_0");
 
 var x: foo;
 >x : Foo
->foo : foo
+>foo : Foo
 
 x("test");
 >x("test") : void
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.types b/tests/baselines/reference/exportAssignmentOfGenericType1.types
index acf68310880..86011e614f7 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.types
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.types
@@ -5,7 +5,7 @@ import q = require("exportAssignmentOfGenericType1_0");
 
 class M extends q<string> { }
 >M : M
->q : q
+>q : T<X>
 
 var m: M;
 >m : M
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index 4e39013d8f2..3fa93127cc8 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -5,7 +5,7 @@ import e = require('./exporter');
 export function w(): e.w { // Should be OK
 >w : () => Widget1
 >e : e
->w : w
+>w : Widget1
 
     return new e.w();
 >new e.w() : Widget1
diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types
index 02255f88391..e65b0e8fc8e 100644
--- a/tests/baselines/reference/exportImportAlias.types
+++ b/tests/baselines/reference/exportImportAlias.types
@@ -92,7 +92,7 @@ module Z {
     // 'y' should be a fundule here
     export import y = X.Y;
 >y : typeof Y
->X : typeof Y
+>X : typeof X
 >Y : typeof Y
 }
 
@@ -147,7 +147,7 @@ module M {
 
     export import D = K.L;
 >D : typeof L
->K : L
+>K : typeof K
 >L : L
 }
 
diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types
index b25fa31f082..13734561233 100644
--- a/tests/baselines/reference/exportImportAndClodule.types
+++ b/tests/baselines/reference/exportImportAndClodule.types
@@ -30,7 +30,7 @@ module M {
 
     export import D = K.L;
 >D : typeof L
->K : L
+>K : typeof K
 >L : L
 }
 var o: { name: string };
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index f8366883d12..2138bce4831 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -5,7 +5,7 @@ import e = require('./exporter');
 export function w(): e.w { // Should be OK
 >w : () => Widget1
 >e : e
->w : w
+>w : Widget1
 
     return {name: 'value' };
 >{name: 'value' } : { name: string; }
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
index 94124bf9e2a..c93c0742ebf 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
@@ -29,14 +29,14 @@ export declare class TPromise<V> {
 >success : (value: V) => TPromise<U>
 >value : V
 >V : V
->TPromise : TPromise
+>TPromise : TPromise<V>
 >U : U
 >error : (err: any) => TPromise<U>
 >err : any
->TPromise : TPromise
+>TPromise : TPromise<V>
 >U : U
 >progress : ProgressCallback
 >ProgressCallback : ProgressCallback
->TPromise : TPromise
+>TPromise : TPromise<V>
 >U : U
 }
diff --git a/tests/baselines/reference/extendedInterfaceGenericType.types b/tests/baselines/reference/extendedInterfaceGenericType.types
index ed2433979aa..17fd949215a 100644
--- a/tests/baselines/reference/extendedInterfaceGenericType.types
+++ b/tests/baselines/reference/extendedInterfaceGenericType.types
@@ -7,23 +7,23 @@ interface Alpha<T> {
 >takesArgOfT : (arg: T) => Alpha<T>
 >arg : T
 >T : T
->Alpha : Alpha
+>Alpha : Alpha<T>
 >T : T
 
     makeBetaOfNumber(): Beta<number>;
 >makeBetaOfNumber : () => Beta<number>
->Beta : Beta
+>Beta : Beta<T>
 }
 interface Beta<T> extends Alpha<T> {
 >Beta : Beta<T>
 >T : T
->Alpha : Alpha
+>Alpha : Alpha<T>
 >T : T
 }
 
 var alpha: Alpha<number>;
 >alpha : Alpha<number>
->Alpha : Alpha
+>Alpha : Alpha<T>
 
 var betaOfNumber = alpha.makeBetaOfNumber();
 >betaOfNumber : Beta<number>
diff --git a/tests/baselines/reference/externalModuleAssignToVar.types b/tests/baselines/reference/externalModuleAssignToVar.types
index f8479bfb490..da2973e5965 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.types
+++ b/tests/baselines/reference/externalModuleAssignToVar.types
@@ -20,7 +20,7 @@ import ext2 = require('externalModuleAssignToVar_core_require2');
 
 var y2: new() => ext2 = ext2;
 >y2 : new () => C
->ext2 : ext2
+>ext2 : C
 >ext2 : typeof C
 
 y2 = ext2; // ok
@@ -33,7 +33,7 @@ import ext3 = require('externalModuleAssignToVar_ext');
 
 var y3: new () => ext3 = ext3;
 >y3 : new () => D
->ext3 : ext3
+>ext3 : D
 >ext3 : typeof D
 
 y3 = ext3; // ok
diff --git a/tests/baselines/reference/externalModuleQualification.types b/tests/baselines/reference/externalModuleQualification.types
index e78f2881a6b..ba8fc516fb8 100644
--- a/tests/baselines/reference/externalModuleQualification.types
+++ b/tests/baselines/reference/externalModuleQualification.types
@@ -23,7 +23,7 @@ class NavigateAction {
     f(editor: DiffEditor<any, any, any>) {
 >f : (editor: DiffEditor<any, any, any>) => void
 >editor : DiffEditor<any, any, any>
->DiffEditor : DiffEditor
+>DiffEditor : DiffEditor<A, B, C>
     }
 }
 
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index 3abee5e22f7..d8c9d444168 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -24,13 +24,13 @@ class D<T>{
 
     recurse: D<T>;
 >recurse : D<T>
->D : D
+>D : D<T>
 >T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D
->D : D
+>D : D<T>
+>D : D<T>
 >T : T
 }
 
@@ -100,7 +100,7 @@ for(var aClass: C = new C();;){}
 
 for(var aGenericClass: D<string> = new D<string>();;){}
 >aGenericClass : D<string>
->D : D
+>D : D<T>
 >new D<string>() : D<string>
 >D : typeof D
 
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.types b/tests/baselines/reference/functionConstraintSatisfaction.types
index 403973c6b3c..70200af6fa9 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction.types
@@ -110,7 +110,7 @@ interface I2<T> {
 }
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 class C2<T> {
 >C2 : C2<T>
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.types b/tests/baselines/reference/functionConstraintSatisfaction3.types
index c2ec5e6d8a1..04963c36519 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.types
@@ -91,7 +91,7 @@ interface I2<T> {
 }
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 class C2<T> {
 >C2 : C2<T>
diff --git a/tests/baselines/reference/functionLiteralForOverloads2.types b/tests/baselines/reference/functionLiteralForOverloads2.types
index dfd7c526549..428b97faff0 100644
--- a/tests/baselines/reference/functionLiteralForOverloads2.types
+++ b/tests/baselines/reference/functionLiteralForOverloads2.types
@@ -64,13 +64,13 @@ var f3: {
     new<T>(x: string): D<T>;
 >T : T
 >x : string
->D : D
+>D : D<T>
 >T : T
 
     new<T>(x: number): D<T>;
 >T : T
 >x : number
->D : D
+>D : D<T>
 >T : T
 
 } = D;
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
index 22b0a30459f..9fe33890b55 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
@@ -14,7 +14,7 @@ class A<U>{
 
     GetEnumerator: () => B<U>;
 >GetEnumerator : () => B<U>
->B : B
+>B : B<V>
 >U : U
 }
 
@@ -23,7 +23,7 @@ function Choice<T>(args: T[]): A<T>;
 >T : T
 >args : T[]
 >T : T
->A : A
+>A : A<U>
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T>;
@@ -31,14 +31,14 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 >v_args : T[]
 >T : T
->A : A
+>A : A<U>
 >T : T
 
 function Choice<T>(...v_args: any[]): A<T>{
 >Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
 >T : T
 >v_args : any[]
->A : A
+>A : A<U>
 >T : T
 
     return new A<T>();
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index d4817b827a2..a7924e89fac 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -26,7 +26,7 @@ function promiseWithCancellation<T>(promise: Q.Promise<T>) {
 >T : T
 >promise : Promise<T>
 >Q : Q
->Promise : Promise
+>Promise : Promise<T>
 >T : T
 
     var deferred = Q.defer<T>(); // used to be an error
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 797a1a4798f..57b5408eabe 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -90,7 +90,7 @@ var x7: Base[] = [d1, d2];
 
 var x8: Array<Base> = [d1, d2];
 >x8 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -125,7 +125,7 @@ var x11: (s: Base[]) => any = n => { var n: Base[]; return null; };
 
 var x12: Genric<Base> = { func: n => { return [d1, d2]; } };
 >x12 : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -202,7 +202,7 @@ class x19 { member: Base[] = [d1, d2] }
 class x20 { member: Array<Base> = [d1, d2] }
 >x20 : x20
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -241,7 +241,7 @@ class x23 { member: (s: Base[]) => any = n => { var n: Base[]; return null; } }
 class x24 { member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x24 : x24
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -318,7 +318,7 @@ class x31 { private member: Base[] = [d1, d2] }
 class x32 { private member: Array<Base> = [d1, d2] }
 >x32 : x32
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -357,7 +357,7 @@ class x35 { private member: (s: Base[]) => any = n => { var n: Base[]; return nu
 class x36 { private member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x36 : x36
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -434,7 +434,7 @@ class x43 { public member: Base[] = [d1, d2] }
 class x44 { public member: Array<Base> = [d1, d2] }
 >x44 : x44
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -473,7 +473,7 @@ class x47 { public member: (s: Base[]) => any = n => { var n: Base[]; return nul
 class x48 { public member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x48 : x48
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -550,7 +550,7 @@ class x55 { static member: Base[] = [d1, d2] }
 class x56 { static member: Array<Base> = [d1, d2] }
 >x56 : x56
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -589,7 +589,7 @@ class x59 { static member: (s: Base[]) => any = n => { var n: Base[]; return nul
 class x60 { static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x60 : x60
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -666,7 +666,7 @@ class x67 { private static member: Base[] = [d1, d2] }
 class x68 { private static member: Array<Base> = [d1, d2] }
 >x68 : x68
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -705,7 +705,7 @@ class x71 { private static member: (s: Base[]) => any = n => { var n: Base[]; re
 class x72 { private static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x72 : x72
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -782,7 +782,7 @@ class x79 { public static member: Base[] = [d1, d2] }
 class x80 { public static member: Array<Base> = [d1, d2] }
 >x80 : x80
 >member : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -821,7 +821,7 @@ class x83 { public static member: (s: Base[]) => any = n => { var n: Base[]; ret
 class x84 { public static member: Genric<Base> = { func: n => { return [d1, d2]; } } }
 >x84 : x84
 >member : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -898,7 +898,7 @@ class x91 { constructor(parm: Base[] = [d1, d2]) { } }
 class x92 { constructor(parm: Array<Base> = [d1, d2]) { } }
 >x92 : x92
 >parm : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -937,7 +937,7 @@ class x95 { constructor(parm: (s: Base[]) => any = n => { var n: Base[]; return
 class x96 { constructor(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x96 : x96
 >parm : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1014,7 +1014,7 @@ class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 >x104 : x104
 >parm : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1053,7 +1053,7 @@ class x107 { constructor(public parm: (s: Base[]) => any = n => { var n: Base[];
 class x108 { constructor(public parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x108 : x108
 >parm : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1130,7 +1130,7 @@ class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 >x116 : x116
 >parm : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1169,7 +1169,7 @@ class x119 { constructor(private parm: (s: Base[]) => any = n => { var n: Base[]
 class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { } }
 >x120 : x120
 >parm : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1246,7 +1246,7 @@ function x127(parm: Base[] = [d1, d2]) { }
 function x128(parm: Array<Base> = [d1, d2]) { }
 >x128 : (parm?: Base[]) => void
 >parm : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1285,7 +1285,7 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) {
 function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
 >x132 : (parm?: Genric<Base>) => void
 >parm : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1354,7 +1354,7 @@ function x139(): Base[] { return [d1, d2]; }
 
 function x140(): Array<Base> { return [d1, d2]; }
 >x140 : () => Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1389,7 +1389,7 @@ function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 
 function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
 >x144 : () => Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1487,7 +1487,7 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >x152 : () => Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1537,7 +1537,7 @@ function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 
 function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; }
 >x156 : () => Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1620,7 +1620,7 @@ var x163: () => Base[] = () => { return [d1, d2]; };
 
 var x164: () => Array<Base> = () => { return [d1, d2]; };
 >x164 : () => Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >() => { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1659,7 +1659,7 @@ var x167: () => (s: Base[]) => any = () => { return n => { var n: Base[]; return
 
 var x168: () => Genric<Base> = () => { return { func: n => { return [d1, d2]; } }; };
 >x168 : () => Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >() => { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => {}[]; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -1736,7 +1736,7 @@ var x175: () => Base[] = function() { return [d1, d2]; };
 
 var x176: () => Array<Base> = function() { return [d1, d2]; };
 >x176 : () => Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >function() { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1775,7 +1775,7 @@ var x179: () => (s: Base[]) => any = function() { return n => { var n: Base[]; r
 
 var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2]; } }; };
 >x180 : () => Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >function() { return { func: n => { return [d1, d2]; } }; } : () => { func: (n: Base[]) => {}[]; }
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -1853,7 +1853,7 @@ module x187 { var t: Base[] = [d1, d2]; }
 module x188 { var t: Array<Base> = [d1, d2]; }
 >x188 : typeof x188
 >t : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1892,7 +1892,7 @@ module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; };
 module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >x192 : typeof x192
 >t : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -1969,7 +1969,7 @@ module x199 { export var t: Base[] = [d1, d2]; }
 module x200 { export var t: Array<Base> = [d1, d2]; }
 >x200 : typeof x200
 >t : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2008,7 +2008,7 @@ module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return nu
 module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >x204 : typeof x204
 >t : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -2067,7 +2067,7 @@ var x211 = <Base[]>[d1, d2];
 var x212 = <Array<Base>>[d1, d2];
 >x212 : Base[]
 ><Array<Base>>[d1, d2] : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2096,7 +2096,7 @@ var x214 = <{n: Base[]; } >{ n: [d1, d2] };
 var x216 = <Genric<Base>>{ func: n => { return [d1, d2]; } };
 >x216 : Genric<Base>
 ><Genric<Base>>{ func: n => { return [d1, d2]; } } : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
@@ -2172,7 +2172,7 @@ var x222 = (<Array<Base>>undefined) || [d1, d2];
 >(<Array<Base>>undefined) || [d1, d2] : Base[]
 >(<Array<Base>>undefined) : Base[]
 ><Array<Base>>undefined : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >undefined : undefined
 >[d1, d2] : Base[]
@@ -2278,7 +2278,7 @@ var x231: Base[]; x231 = [d1, d2];
 
 var x232: Array<Base>; x232 = [d1, d2];
 >x232 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >x232 = [d1, d2] : Base[]
 >x232 : Base[]
@@ -2321,7 +2321,7 @@ var x235: (s: Base[]) => any; x235 = n => { var n: Base[]; return null; };
 
 var x236: Genric<Base>; x236 = { func: n => { return [d1, d2]; } };
 >x236 : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >x236 = { func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >x236 : Genric<Base>
@@ -2414,7 +2414,7 @@ var x243: { n: Base[]; } = { n: [d1, d2] };
 var x244: { n: Array<Base>; } = { n: [d1, d2] };
 >x244 : { n: Base[]; }
 >n : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
@@ -2461,7 +2461,7 @@ var x247: { n: (s: Base[]) => any; } = { n: n => { var n: Base[]; return null; }
 var x248: { n: Genric<Base>; } = { n: { func: n => { return [d1, d2]; } } };
 >x248 : { n: Genric<Base>; }
 >n : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >{ n: { func: n => { return [d1, d2]; } } } : { n: { func: (n: Base[]) => {}[]; }; }
 >n : { func: (n: Base[]) => {}[]; }
@@ -2511,7 +2511,7 @@ var x255: Base[][] = [[d1, d2]];
 
 var x256: Array<Base>[] = [[d1, d2]];
 >x256 : Base[][]
->Array : Array
+>Array : T[]
 >Base : Base
 >[[d1, d2]] : Base[][]
 >[d1, d2] : Base[]
@@ -2540,7 +2540,7 @@ var x258: {n: Base[]; } [] = [{ n: [d1, d2] }];
 
 var x260: Genric<Base>[] = [{ func: n => { return [d1, d2]; } }];
 >x260 : Genric<Base>[]
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >[{ func: n => { return [d1, d2]; } }] : Genric<Base>[]
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -2604,7 +2604,7 @@ var x265: Base[] = [d1, d2] || undefined;
 
 var x266: Array<Base> = [d1, d2] || undefined;
 >x266 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] || undefined : Base[]
 >[d1, d2] : Base[]
@@ -2687,7 +2687,7 @@ var x273: Base[] = undefined || [d1, d2];
 
 var x274: Array<Base> = undefined || [d1, d2];
 >x274 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >undefined || [d1, d2] : Base[]
 >undefined : undefined
@@ -2786,7 +2786,7 @@ var x281: Base[] = [d1, d2] || [d1, d2];
 
 var x282: Array<Base> = [d1, d2] || [d1, d2];
 >x282 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >[d1, d2] || [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -2919,7 +2919,7 @@ var x291: Base[] = true ? [d1, d2] : [d1, d2];
 
 var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
 >x292 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >true ? [d1, d2] : [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -2973,7 +2973,7 @@ var x295: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : n =
 
 var x296: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } };
 >x296 : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >true ? { func: n => { return [d1, d2]; } } : { func: n => { return [d1, d2]; } } : Genric<Base>
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -3064,7 +3064,7 @@ var x303: Base[] = true ? undefined : [d1, d2];
 
 var x304: Array<Base> = true ? undefined : [d1, d2];
 >x304 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >true ? undefined : [d1, d2] : Base[]
 >undefined : undefined
@@ -3107,7 +3107,7 @@ var x307: (s: Base[]) => any = true ? undefined : n => { var n: Base[]; return n
 
 var x308: Genric<Base> = true ? undefined : { func: n => { return [d1, d2]; } };
 >x308 : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >true ? undefined : { func: n => { return [d1, d2]; } } : Genric<Base>
 >undefined : undefined
@@ -3192,7 +3192,7 @@ var x315: Base[] = true ? [d1, d2] : undefined;
 
 var x316: Array<Base> = true ? [d1, d2] : undefined;
 >x316 : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >true ? [d1, d2] : undefined : Base[]
 >[d1, d2] : Base[]
@@ -3235,7 +3235,7 @@ var x319: (s: Base[]) => any = true ? n => { var n: Base[]; return null; } : und
 
 var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 >x320 : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >true ? { func: n => { return [d1, d2]; } } : undefined : Genric<Base>
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -3328,7 +3328,7 @@ function x327(n: Base[]) { }; x327([d1, d2]);
 function x328(n: Array<Base>) { }; x328([d1, d2]);
 >x328 : (n: Base[]) => void
 >n : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >x328([d1, d2]) : void
 >x328 : (n: Base[]) => void
@@ -3375,7 +3375,7 @@ function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null
 function x332(n: Genric<Base>) { }; x332({ func: n => { return [d1, d2]; } });
 >x332 : (n: Genric<Base>) => void
 >n : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >x332({ func: n => { return [d1, d2]; } }) : void
 >x332 : (n: Genric<Base>) => void
@@ -3483,7 +3483,7 @@ var x340 = (n: Array<Base>) => n; x340([d1, d2]);
 >x340 : (n: Base[]) => Base[]
 >(n: Array<Base>) => n : (n: Base[]) => Base[]
 >n : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >n : Base[]
 >x340([d1, d2]) : Base[]
@@ -3538,7 +3538,7 @@ var x344 = (n: Genric<Base>) => n; x344({ func: n => { return [d1, d2]; } });
 >x344 : (n: Genric<Base>) => Genric<Base>
 >(n: Genric<Base>) => n : (n: Genric<Base>) => Genric<Base>
 >n : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >n : Genric<Base>
 >x344({ func: n => { return [d1, d2]; } }) : Genric<Base>
@@ -3640,7 +3640,7 @@ var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
 >x352 : (n: Base[]) => void
 >function(n: Array<Base>) { } : (n: Base[]) => void
 >n : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >x352([d1, d2]) : void
 >x352 : (n: Base[]) => void
@@ -3691,7 +3691,7 @@ var x356 = function(n: Genric<Base>) { }; x356({ func: n => { return [d1, d2]; }
 >x356 : (n: Genric<Base>) => void
 >function(n: Genric<Base>) { } : (n: Genric<Base>) => void
 >n : Genric<Base>
->Genric : Genric
+>Genric : Genric<T>
 >Base : Base
 >x356({ func: n => { return [d1, d2]; } }) : void
 >x356 : (n: Genric<Base>) => void
diff --git a/tests/baselines/reference/genericAndNonGenericOverload1.types b/tests/baselines/reference/genericAndNonGenericOverload1.types
index 13f8d49fc10..67cc8a01f18 100644
--- a/tests/baselines/reference/genericAndNonGenericOverload1.types
+++ b/tests/baselines/reference/genericAndNonGenericOverload1.types
@@ -16,7 +16,7 @@ interface callable2<T> {
 }
 var c2: callable2<number>;
 >c2 : callable2<number>
->callable2 : callable2
+>callable2 : callable2<T>
 
 c2<string>(1);
 >c2<string>(1) : string
diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
index d585e896c8f..d7128e9dac4 100644
--- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
+++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
@@ -24,7 +24,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty.types b/tests/baselines/reference/genericBaseClassLiteralProperty.types
index 4ed9b3f4d7d..51246348ded 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty.types
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty.types
@@ -14,7 +14,7 @@ class BaseClass<T> {
 
 class SubClass extends BaseClass<number> {
 >SubClass : SubClass
->BaseClass : BaseClass
+>BaseClass : BaseClass<T>
 
     public Error(): void {
 >Error : () => void
diff --git a/tests/baselines/reference/genericBaseClassLiteralProperty2.types b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
index 004dbac45bf..b2d156e3c16 100644
--- a/tests/baselines/reference/genericBaseClassLiteralProperty2.types
+++ b/tests/baselines/reference/genericBaseClassLiteralProperty2.types
@@ -24,7 +24,7 @@ class BaseCollection2<TItem extends CollectionItem2> {
 
 class DataView2 extends BaseCollection2<CollectionItem2> {
 >DataView2 : DataView2
->BaseCollection2 : BaseCollection2
+>BaseCollection2 : BaseCollection2<TItem>
 >CollectionItem2 : CollectionItem2
 
     fillItems(item: CollectionItem2) {
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.types b/tests/baselines/reference/genericCallTypeArgumentInference.types
index b1ba19baac8..ced2daee38d 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.types
@@ -306,7 +306,7 @@ interface I<T, U> {
 
 var i: I<string, number>;
 >i : I<string, number>
->I : I
+>I : I<T, U>
 
 var r4 = i.foo('', 1); // string
 >r4 : string
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
index ee6e2388eae..dcff9ef8a16 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
@@ -406,7 +406,7 @@ interface I<T extends Base, U extends Derived> {
 
 var i: I<Base, Derived>;
 >i : I<Base, Derived>
->I : I
+>I : I<T, U>
 >Base : Base
 >Derived : Derived
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 11b1ca59aae..89d7afd94e2 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -39,7 +39,7 @@ var i: I;
 
 var i2: I2<string>;
 >i2 : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 var a: {
 >a : new <T>(x: T) => T
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.types b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
index 73b773d039d..ddbd7d83054 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
@@ -26,10 +26,10 @@ function foo<T>(t: X<T>, t2: X<T>) {
 >foo : <T>(t: X<T>, t2: X<T>) => T
 >T : T
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 
     var x: T;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
index 6721176c20a..0065811fdc1 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
@@ -117,7 +117,7 @@ interface I<T, U> {
 
 var i: I<Base, Derived>;
 >i : I<Base, Derived>
->I : I
+>I : I<T, U>
 >Base : Base
 >Derived : Derived
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
index 9dad9313319..8e062a8d5bf 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
@@ -33,10 +33,10 @@ function foo<T extends { x: string }>(t: X<T>, t2: X<T>) {
 >T : T
 >x : string
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 
     var x: T;
@@ -78,10 +78,10 @@ function foo2<T extends C>(t: X<T>, t2: X<T>) {
 >T : T
 >C : C
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 
     var x: T;
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
index 5819569bf7f..29706ba7e3d 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
@@ -71,7 +71,7 @@ function f2<T extends Base>(x: I<T>) {
 >T : T
 >Base : Base
 >x : I<T>
->I : I
+>I : I<T>
 >T : T
 
     var r: T;
@@ -83,7 +83,7 @@ function f2<T extends Base>(x: I<T>) {
 }
 var i: I<Derived>;
 >i : I<Derived>
->I : I
+>I : I<T>
 >Derived : Derived
 
 var r3 = f2(i);
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
index d4cb5dcd14b..97e584dca3f 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
@@ -18,7 +18,7 @@ module M {
 
         public value: I<T>;
 >value : I<T>
->I : I
+>I : I<T>
 >T : T
     }
     export class A<T> {
@@ -31,8 +31,8 @@ module M {
     export class B<T> extends C1<A<T>> { }
 >B : B<T>
 >T : T
->C1 : C1
->A : A
+>C1 : C1<T>
+>A : A<T>
 >T : T
 
     export class D<T> {
@@ -42,20 +42,20 @@ module M {
         _subscribe(viewModel: B<T>): void {
 >_subscribe : (viewModel: B<T>) => void
 >viewModel : B<T>
->B : B
+>B : B<T>
 >T : T
 
             var f = (newValue: A<T>) => { };
 >f : (newValue: A<T>) => void
 >(newValue: A<T>) => { } : (newValue: A<T>) => void
 >newValue : A<T>
->A : A
+>A : A<T>
 >T : T
 
             var v: I<A<T>> = viewModel.value;
 >v : I<A<T>>
->I : I
->A : A
+>I : I<T>
+>A : A<T>
 >T : T
 >viewModel.value : I<A<T>>
 >viewModel : B<T>
@@ -76,7 +76,7 @@ module M {
 >subscribe : (callback: (newValue: A<T>) => void) => any
 >(newValue: A<T>) => { } : (newValue: A<T>) => void
 >newValue : A<T>
->A : A
+>A : A<T>
 >T : T
         }
     }
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
index 81236d74f42..583b6163b53 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
@@ -13,7 +13,7 @@ module bar {
 >Foo : Foo<T>
 >T : T
 >foo : foo
->IFoo : IFoo
+>IFoo : IFoo<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
index 66b21c54d06..800b215f123 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts ===
 class A extends B<string> { }
 >A : A
->B : B
+>B : B<U>
 
 class B<U> extends C { }
 >B : B<U>
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 7f1e931268d..1f5f8cd4088 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -18,7 +18,7 @@ interface KnockoutObservableBase<T> {
 interface KnockoutObservable<T> extends KnockoutObservableBase<T> {
 >KnockoutObservable : KnockoutObservable<T>
 >T : T
->KnockoutObservableBase : KnockoutObservableBase
+>KnockoutObservableBase : KnockoutObservableBase<T>
 >T : T
 
     equalityComparer(a: T, b: T): boolean;
@@ -38,7 +38,7 @@ interface KnockoutObservable<T> extends KnockoutObservableBase<T> {
 interface KnockoutObservableArray<T> extends KnockoutObservable<T[]> {
 >KnockoutObservableArray : KnockoutObservableArray<T>
 >T : T
->KnockoutObservable : KnockoutObservable
+>KnockoutObservable : KnockoutObservable<T>
 >T : T
 
     indexOf(searchElement: T, fromIndex?: number): number;
@@ -126,13 +126,13 @@ interface KnockoutObservableArrayStatic {
 
     fn: KnockoutObservableArray<any>;
 >fn : KnockoutObservableArray<any>
->KnockoutObservableArray : KnockoutObservableArray
+>KnockoutObservableArray : KnockoutObservableArray<T>
 
     <T>(value?: T[]): KnockoutObservableArray<T>;
 >T : T
 >value : T[]
 >T : T
->KnockoutObservableArray : KnockoutObservableArray
+>KnockoutObservableArray : KnockoutObservableArray<T>
 >T : T
 }
 
@@ -158,15 +158,15 @@ module Portal.Controls.Validators {
 
         public message: KnockoutObservable<string>;
 >message : KnockoutObservable<string>
->KnockoutObservable : KnockoutObservable
+>KnockoutObservable : KnockoutObservable<T>
 
         public validationState: KnockoutObservable<number>;
 >validationState : KnockoutObservable<number>
->KnockoutObservable : KnockoutObservable
+>KnockoutObservable : KnockoutObservable<T>
 
         public validate: KnockoutObservable<TValue>;
 >validate : KnockoutObservable<TValue>
->KnockoutObservable : KnockoutObservable
+>KnockoutObservable : KnockoutObservable<T>
 >TValue : TValue
 
         constructor(message?: string) { }
@@ -194,7 +194,7 @@ module PortalFx.ViewModels.Controls.Validators {
 >Portal : Portal
 >Controls : Controls
 >Validators : Validators
->Validator : Validator
+>Validator : Validator<TValue>
 >TValue : TValue
 
         constructor(message?: string) {
@@ -214,12 +214,12 @@ interface Contract<TValue> {
 
     validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>;
 >validators : KnockoutObservableArray<Validator<TValue>>
->KnockoutObservableArray : KnockoutObservableArray
+>KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : PortalFx
 >ViewModels : ViewModels
 >Controls : Controls
 >Validators : Validators
->Validator : Validator
+>Validator : Validator<TValue>
 >TValue : TValue
 }
 
@@ -227,17 +227,17 @@ interface Contract<TValue> {
 class ViewModel<TValue> implements Contract<TValue> {
 >ViewModel : ViewModel<TValue>
 >TValue : TValue
->Contract : Contract
+>Contract : Contract<TValue>
 >TValue : TValue
 
     public validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>> = ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>();
 >validators : KnockoutObservableArray<Validator<TValue>>
->KnockoutObservableArray : KnockoutObservableArray
+>KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : PortalFx
 >ViewModels : ViewModels
 >Controls : Controls
 >Validators : Validators
->Validator : Validator
+>Validator : Validator<TValue>
 >TValue : TValue
 >ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>() : KnockoutObservableArray<Validator<TValue>>
 >ko.observableArray : KnockoutObservableArrayStatic
@@ -247,7 +247,7 @@ class ViewModel<TValue> implements Contract<TValue> {
 >ViewModels : ViewModels
 >Controls : Controls
 >Validators : Validators
->Validator : Validator
+>Validator : Validator<TValue>
 >TValue : TValue
 }
 
diff --git a/tests/baselines/reference/genericClassStaticMethod.types b/tests/baselines/reference/genericClassStaticMethod.types
index 509a700e65c..3d4c02317d6 100644
--- a/tests/baselines/reference/genericClassStaticMethod.types
+++ b/tests/baselines/reference/genericClassStaticMethod.types
@@ -11,7 +11,7 @@ class Foo<T> {
 class Bar<T> extends Foo<T> {
 >Bar : Bar<T>
 >T : T
->Foo : Foo
+>Foo : Foo<T>
 >T : T
 
     static getFoo() {
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index c0ed09cc300..68b94d81d02 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -129,7 +129,7 @@ module WithCandidates {
 
     var c: C<number>;
 >c : C<number>
->C : C
+>C : C<T>
 
     var r4 = c.foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
 >r4 : string
@@ -187,7 +187,7 @@ module WithCandidates {
 
     var c2: C2<number, string>;
 >c2 : C2<number, string>
->C2 : C2
+>C2 : C2<T, U>
 
     var r7 = c2.foo3(1, <Z>(a: Z) => '', ''); // string
 >r7 : string
@@ -235,7 +235,7 @@ module WithCandidates {
     }
     var c3: C3<number, string>;
 >c3 : C3<number, string>
->C3 : C3
+>C3 : C3<T, U>
 
     function other<T, U>(t: T, u: U) {
 >other : <T, U>(t: T, u: U) => void
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
index a256deca0a2..25fe052d498 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
@@ -41,10 +41,10 @@ module Class {
 >T : T
 >x : string
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 
             var x: T;
@@ -70,7 +70,7 @@ module Class {
 
     var g: G<{ x: string; y: string }>;
 >g : G<{ x: string; y: string; }>
->G : G
+>G : G<T>
 >x : string
 >y : string
 
@@ -102,10 +102,10 @@ module Class {
 >T : T
 >C : C
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 
             var x: T;
@@ -118,7 +118,7 @@ module Class {
     }
     var g2: G2<D>;
 >g2 : G2<D>
->G2 : G2
+>G2 : G2<T>
 >D : D
 
     var r = g2.foo2(c1, d1);
@@ -153,10 +153,10 @@ module Interface {
 >T : T
 >x : string
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 >T : T
     }
@@ -175,7 +175,7 @@ module Interface {
 
     var g: G<{ x: string; y: string }>;
 >g : G<{ x: string; y: string; }>
->G : G
+>G : G<T>
 >x : string
 >y : string
 
@@ -207,17 +207,17 @@ module Interface {
 >T : T
 >C : C
 >t : X<T>
->X : X
+>X : X<T>
 >T : T
 >t2 : X<T>
->X : X
+>X : X<T>
 >T : T
 >T : T
     }
 
     var g2: G2<D>;
 >g2 : G2<D>
->G2 : G2
+>G2 : G2<T>
 >D : D
 
     var r = g2.foo2(c1, d1);
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types
index e5b291e2b02..b0df737ee68 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.types
+++ b/tests/baselines/reference/genericClassWithStaticFactory.types
@@ -8,17 +8,17 @@ module Editor {
 
         public next: List<T>;
 >next : List<T>
->List : List
+>List : List<T>
 >T : T
 
         public prev: List<T>;
 >prev : List<T>
->List : List
+>List : List<T>
 >T : T
 
         private listFactory: ListFactory<T>;
 >listFactory : ListFactory<T>
->ListFactory : ListFactory
+>ListFactory : ListFactory<T>
 >T : T
 
         constructor(public isHead: boolean, public data: T) {
@@ -41,7 +41,7 @@ module Editor {
 >add : (data: T) => List<T>
 >data : T
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             var entry = this.listFactory.MakeEntry(data);
@@ -95,7 +95,7 @@ module Editor {
 
             var entry: List<T>;
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
 
             var i: number;
@@ -169,7 +169,7 @@ module Editor {
         public pushEntry(entry: List<T>): void {
 >pushEntry : (entry: List<T>) => void
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
 
             entry.isHead = false;
@@ -275,9 +275,9 @@ module Editor {
         public popEntry(head: List<T>): List<T> {
 >popEntry : (head: List<T>) => List<T>
 >head : List<T>
->List : List
+>List : List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             if (this.next.isHead) {
@@ -306,9 +306,9 @@ module Editor {
         public insertEntry(entry: List<T>): List<T> {
 >insertEntry : (entry: List<T>) => List<T>
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             entry.isHead = false;
@@ -357,12 +357,12 @@ module Editor {
 >insertAfter : (data: T) => List<T>
 >data : T
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             var entry: List<T> = this.listFactory.MakeEntry(data);
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
 >this.listFactory.MakeEntry(data) : List<T>
 >this.listFactory.MakeEntry : <T>(data: T) => List<T>
@@ -411,9 +411,9 @@ module Editor {
         public insertEntryBefore(entry: List<T>): List<T> {
 >insertEntryBefore : (entry: List<T>) => List<T>
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             this.prev.next = entry;
@@ -456,7 +456,7 @@ module Editor {
 >insertBefore : (data: T) => List<T>
 >data : T
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             var entry = this.listFactory.MakeEntry(data);
@@ -485,12 +485,12 @@ module Editor {
         public MakeHead<T>(): List<T> {
 >MakeHead : <T>() => List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             var entry: List<T> = new List<T>(true, null);
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
 >new List<T>(true, null) : List<T>
 >List : typeof List
@@ -519,12 +519,12 @@ module Editor {
 >T : T
 >data : T
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             var entry: List<T> = new List<T>(false, data);
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
 >new List<T>(false, data) : List<T>
 >List : typeof List
@@ -553,9 +553,9 @@ module Editor {
 >RemoveEntry : <T>(entry: List<T>) => List<T>
 >T : T
 >entry : List<T>
->List : List
+>List : List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             if (entry == null) {
diff --git a/tests/baselines/reference/genericClasses0.types b/tests/baselines/reference/genericClasses0.types
index cdf239179e3..b02fa07c219 100644
--- a/tests/baselines/reference/genericClasses0.types
+++ b/tests/baselines/reference/genericClasses0.types
@@ -10,7 +10,7 @@ class C<T> {
 
 var v1 : C<string>;
 >v1 : C<string>
->C : C
+>C : C<T>
 
 var y = v1.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses2.types b/tests/baselines/reference/genericClasses2.types
index d1ba890a50c..2b366f0a8fd 100644
--- a/tests/baselines/reference/genericClasses2.types
+++ b/tests/baselines/reference/genericClasses2.types
@@ -18,17 +18,17 @@ class C<T> {
 
 	public y: Foo<T>;
 >y : Foo<T>
->Foo : Foo
+>Foo : Foo<T>
 >T : T
 
 	public z: Foo<number>;
 >z : Foo<number>
->Foo : Foo
+>Foo : Foo<T>
 }
 
 var v1 : C<string>;
 >v1 : C<string>
->C : C
+>C : C<T>
 
 var y = v1.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses3.types b/tests/baselines/reference/genericClasses3.types
index 60f9b6d0ef3..ea0ebcd2cc7 100644
--- a/tests/baselines/reference/genericClasses3.types
+++ b/tests/baselines/reference/genericClasses3.types
@@ -15,7 +15,7 @@ class B<T> {
 class C<T> extends B<T> {
 >C : C<T>
 >T : T
->B : B
+>B : B<T>
 >T : T
 
     public x: T;
@@ -25,7 +25,7 @@ class C<T> extends B<T> {
 
 var v2: C <string>;
 >v2 : C<string>
->C : C
+>C : C<T>
 
 var y = v2.x; // should be 'string'
 >y : string
diff --git a/tests/baselines/reference/genericClasses4.types b/tests/baselines/reference/genericClasses4.types
index 8c09b1eed3a..ac3d05be84d 100644
--- a/tests/baselines/reference/genericClasses4.types
+++ b/tests/baselines/reference/genericClasses4.types
@@ -17,7 +17,7 @@ class Vec2_T<A>
 >a : A
 >A : A
 >B : B
->Vec2_T : Vec2_T
+>Vec2_T : Vec2_T<A>
 >B : B
 
         var x:B = f(this.x);
@@ -40,7 +40,7 @@ class Vec2_T<A>
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Vec2_T<B>
->Vec2_T : Vec2_T
+>Vec2_T : Vec2_T<A>
 >B : B
 >new Vec2_T(x, y) : Vec2_T<B>
 >Vec2_T : typeof Vec2_T
@@ -54,11 +54,11 @@ class Vec2_T<A>
 >apply : <B>(f: Vec2_T<(a: A) => B>) => Vec2_T<B>
 >B : B
 >f : Vec2_T<(a: A) => B>
->Vec2_T : Vec2_T
+>Vec2_T : Vec2_T<A>
 >a : A
 >A : A
 >B : B
->Vec2_T : Vec2_T
+>Vec2_T : Vec2_T<A>
 >B : B
 
         var x:B = f.x(this.x);
@@ -85,7 +85,7 @@ class Vec2_T<A>
 
         var retval: Vec2_T<B> = new Vec2_T(x, y);
 >retval : Vec2_T<B>
->Vec2_T : Vec2_T
+>Vec2_T : Vec2_T<A>
 >B : B
 >new Vec2_T(x, y) : Vec2_T<B>
 >Vec2_T : typeof Vec2_T
diff --git a/tests/baselines/reference/genericClassesInModule2.types b/tests/baselines/reference/genericClassesInModule2.types
index c8c343f9228..5da8c43097f 100644
--- a/tests/baselines/reference/genericClassesInModule2.types
+++ b/tests/baselines/reference/genericClassesInModule2.types
@@ -6,7 +6,7 @@ export class A<T1>{
     constructor( public callback: (self: A<T1>) => void) {
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A
+>A : A<T1>
 >T1 : T1
 
         var child = new B(this);
@@ -19,7 +19,7 @@ export class A<T1>{
 >AAA : (callback: (self: A<T1>) => void) => void
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A
+>A : A<T1>
 >T1 : T1
 
         var child = new B(this);
@@ -36,18 +36,18 @@ export interface C<T1>{
 
     child: B<T1>;
 >child : B<T1>
->B : B
+>B : B<T2>
 >T1 : T1
 
     (self: C<T1>): void;
 >self : C<T1>
->C : C
+>C : C<T1>
 >T1 : T1
 
     new(callback: (self: C<T1>) => void)
 >callback : (self: C<T1>) => void
 >self : C<T1>
->C : C
+>C : C<T1>
 >T1 : T1
 }
 
diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types
index 9c2dcaccf08..b4646fde0a7 100644
--- a/tests/baselines/reference/genericCloduleInModule.types
+++ b/tests/baselines/reference/genericCloduleInModule.types
@@ -23,7 +23,7 @@ module A {
 var b: A.B<number>;
 >b : B<number>
 >A : A
->B : B
+>B : B<T>
 
 b.foo();
 >b.foo() : void
diff --git a/tests/baselines/reference/genericConstraintDeclaration.types b/tests/baselines/reference/genericConstraintDeclaration.types
index 2d23a75c685..126da138d4e 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.types
+++ b/tests/baselines/reference/genericConstraintDeclaration.types
@@ -6,7 +6,7 @@ class List<T extends {}>{
     static empty<T extends {}>(): List<T>{return null;}
 >empty : <T extends {}>() => List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index 6f80266d8a5..920d66fc175 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -52,7 +52,7 @@ module EndGate.Tweening {
 
     export class NumberTween extends Tween<number>{
 >NumberTween : NumberTween
->Tween : Tween
+>Tween : Tween<T>
 
         constructor(from: number) {
 >from : number
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index c7482c64f14..94dd467ba80 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -51,7 +51,7 @@ module EndGate.Tweening {
 
     export class NumberTween extends Tween<Number>{
 >NumberTween : NumberTween
->Tween : Tween
+>Tween : Tween<T>
 >Number : Number
 
         constructor(from: number) {
diff --git a/tests/baselines/reference/genericFunctions3.types b/tests/baselines/reference/genericFunctions3.types
index 25011d1cf1d..2215e30adcf 100644
--- a/tests/baselines/reference/genericFunctions3.types
+++ b/tests/baselines/reference/genericFunctions3.types
@@ -6,7 +6,7 @@ interface Query<T> {
     foo(x: string): Query<T[]>;
 >foo : (x: string) => Query<T[]>
 >x : string
->Query : Query
+>Query : Query<T>
 >T : T
 }
  
@@ -14,14 +14,14 @@ function from<T>(arg: boolean): Query<T>; // was Error: Overload signature is no
 >from : <T>(arg: boolean) => Query<T>
 >T : T
 >arg : boolean
->Query : Query
+>Query : Query<T>
 >T : T
 
 function from<T>(arg: any): Query<T> {
 >from : <T>(arg: boolean) => Query<T>
 >T : T
 >arg : any
->Query : Query
+>Query : Query<T>
 >T : T
 
     return undefined;
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
index f779f1ab888..74b8b5e6858 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
@@ -7,7 +7,7 @@ interface Utils {
 >T : T
 >S : S
 >c : T[]
->Array : Array
+>Array : T[]
 >T : T
 >folder : (s: S, t: T) => T
 >s : S
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
index 4de26343bbc..4df90324283 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters3.types
@@ -16,7 +16,7 @@ interface Utils {
 >T : T
 >S : S
 >c : Collection<T>
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 >folder : (s: S, t: T) => T
 >s : S
@@ -34,7 +34,7 @@ interface Utils {
 >U : U
 >V : V
 >c : Collection<T>
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 >mapper : (x: T) => U
 >x : T
@@ -44,7 +44,7 @@ interface Utils {
 >y : U
 >U : U
 >V : V
->Collection : Collection
+>Collection : Collection<T>
 >V : V
 }
 var utils: Utils;
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index fb84602a076..0bd8c533759 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -28,7 +28,7 @@
 >T : T
 >value : T
 >T : T
->Observable : Observable
+>Observable : Observable<T>
 >T : T
     } 
     var o = { 
diff --git a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
index 69597826589..449c5712c6c 100644
--- a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
+++ b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
@@ -10,7 +10,7 @@ interface Pair<T1, T2> { first: T1; second: T2; }
 
 var x: Pair<string, number>
 >x : Pair<string, number>
->Pair : Pair
+>Pair : Pair<T1, T2>
 
 var y: { first: string; second: number; }
 >y : { first: string; second: number; }
@@ -32,7 +32,7 @@ declare function f<T, U>(x: Pair<T, U>);
 >T : T
 >U : U
 >x : Pair<T, U>
->Pair : Pair
+>Pair : Pair<T1, T2>
 >T : T
 >U : U
 
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
index 7d1861ea40d..f262fda55f6 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
@@ -8,7 +8,7 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 >A : A
 >fn : (ifoo: IFoo<A>) => void
 >ifoo : IFoo<A>
->IFoo : IFoo
+>IFoo : IFoo<A>
 >A : A
 
     foo(fn); // Invocation is necessary to repro (!)
diff --git a/tests/baselines/reference/genericInterfaceImplementation.types b/tests/baselines/reference/genericInterfaceImplementation.types
index bb0e1250f24..b075864634c 100644
--- a/tests/baselines/reference/genericInterfaceImplementation.types
+++ b/tests/baselines/reference/genericInterfaceImplementation.types
@@ -10,14 +10,14 @@ interface IOption<A> {
     flatten<B>(): IOption<B>;
 >flatten : <B>() => IOption<B>
 >B : B
->IOption : IOption
+>IOption : IOption<A>
 >B : B
 }
 
 class None<T> implements IOption<T>{
 >None : None<T>
 >T : T
->IOption : IOption
+>IOption : IOption<A>
 >T : T
 
     get(): T {
@@ -30,7 +30,7 @@ class None<T> implements IOption<T>{
     flatten<U>() : IOption<U> {
 >flatten : <U>() => IOption<U>
 >U : U
->IOption : IOption
+>IOption : IOption<A>
 >U : U
 
         return new None<U>();
diff --git a/tests/baselines/reference/genericInterfaceTypeCall.types b/tests/baselines/reference/genericInterfaceTypeCall.types
index 4f74c3137fb..fcf64fac066 100644
--- a/tests/baselines/reference/genericInterfaceTypeCall.types
+++ b/tests/baselines/reference/genericInterfaceTypeCall.types
@@ -10,7 +10,7 @@ interface Foo<T> {
 }
 var foo: Foo<string>
 >foo : Foo<string>
->Foo : Foo
+>Foo : Foo<T>
  
 interface bar<T> {
 >bar : bar<T>
@@ -30,7 +30,7 @@ interface bar<T> {
 }
 var test: bar<string>;
 >test : bar<string>
->bar : bar
+>bar : bar<T>
  
 test.fail(arg => foo.reject(arg));
 >test.fail(arg => foo.reject(arg)) : void
diff --git a/tests/baselines/reference/genericObjectLitReturnType.types b/tests/baselines/reference/genericObjectLitReturnType.types
index b597931209c..2241002646a 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.types
+++ b/tests/baselines/reference/genericObjectLitReturnType.types
@@ -15,7 +15,7 @@ class X<T>
  
 var x: X<number>;
 >x : X<number>
->X : X
+>X : X<T>
 
 var t1 = x.f(5);
 >t1 : { a: number; }
diff --git a/tests/baselines/reference/genericOverloadSignatures.types b/tests/baselines/reference/genericOverloadSignatures.types
index 134daff9ba3..e1efe0785ab 100644
--- a/tests/baselines/reference/genericOverloadSignatures.types
+++ b/tests/baselines/reference/genericOverloadSignatures.types
@@ -72,7 +72,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 
     new <T>(x: T, y: string): C2<T>;
@@ -80,7 +80,7 @@ var b: {
 >x : T
 >T : T
 >y : string
->C2 : C2
+>C2 : C2<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/genericPrototypeProperty2.types b/tests/baselines/reference/genericPrototypeProperty2.types
index ca45d87ef52..1c95041b650 100644
--- a/tests/baselines/reference/genericPrototypeProperty2.types
+++ b/tests/baselines/reference/genericPrototypeProperty2.types
@@ -35,5 +35,5 @@ class MyEventWrapper extends BaseEventWrapper {
 
     t: MyEvent<any>; // any satisfies constraint and passes assignability check between 'target' properties
 >t : MyEvent<any>
->MyEvent : MyEvent
+>MyEvent : MyEvent<T>
 }
diff --git a/tests/baselines/reference/genericPrototypeProperty3.types b/tests/baselines/reference/genericPrototypeProperty3.types
index 381a5b88773..5a190164642 100644
--- a/tests/baselines/reference/genericPrototypeProperty3.types
+++ b/tests/baselines/reference/genericPrototypeProperty3.types
@@ -29,5 +29,5 @@ class MyEventWrapper extends BaseEventWrapper {
 
     t: MyEvent<any>;
 >t : MyEvent<any>
->MyEvent : MyEvent
+>MyEvent : MyEvent<T>
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
index f327016f41d..2f62a20c415 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
@@ -48,7 +48,7 @@ module TypeScript2 {
 >A : A
 >B : B
 >C : C
->PullTypeSymbol : PullTypeSymbol
+>PullTypeSymbol : PullTypeSymbol<A, B, C>
 >A : A
 >B : B
 >C : C
diff --git a/tests/baselines/reference/genericReversingTypeParameters.types b/tests/baselines/reference/genericReversingTypeParameters.types
index b133c07d80f..a95f6620082 100644
--- a/tests/baselines/reference/genericReversingTypeParameters.types
+++ b/tests/baselines/reference/genericReversingTypeParameters.types
@@ -6,7 +6,7 @@ class BiMap<K, V> {
 
     private inverseBiMap: BiMap<V, K>;
 >inverseBiMap : BiMap<V, K>
->BiMap : BiMap
+>BiMap : BiMap<K, V>
 >V : V
 >K : K
 
@@ -18,7 +18,7 @@ class BiMap<K, V> {
 
     public inverse(): BiMap<V, K> { return null; }
 >inverse : () => BiMap<V, K>
->BiMap : BiMap
+>BiMap : BiMap<K, V>
 >V : V
 >K : K
 }
diff --git a/tests/baselines/reference/genericReversingTypeParameters2.types b/tests/baselines/reference/genericReversingTypeParameters2.types
index 1a71cf138e2..4356280f4d3 100644
--- a/tests/baselines/reference/genericReversingTypeParameters2.types
+++ b/tests/baselines/reference/genericReversingTypeParameters2.types
@@ -6,7 +6,7 @@ class BiMap<K, V> {
 
     private inverseBiMap: BiMap<V, K>;
 >inverseBiMap : BiMap<V, K>
->BiMap : BiMap
+>BiMap : BiMap<K, V>
 >V : V
 >K : K
 
@@ -18,7 +18,7 @@ class BiMap<K, V> {
 
     public inverse(): BiMap<V, K> { return null; }
 >inverse : () => BiMap<V, K>
->BiMap : BiMap
+>BiMap : BiMap<K, V>
 >V : V
 >K : K
 }
diff --git a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
index 536e1b7d4c0..c75f07f6aef 100644
--- a/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
+++ b/tests/baselines/reference/genericSpecializationToTypeLiteral1.types
@@ -7,7 +7,7 @@ interface IEnumerable<T> {
 >zip : { <TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(...params: any[]): IEnumerable<TResult>; }
 >TResult : TResult
 >second : IEnumerable<T>
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 >resultSelector : (first: T, second: T, index: number) => TResult
 >first : T
@@ -16,7 +16,7 @@ interface IEnumerable<T> {
 >T : T
 >index : number
 >TResult : TResult
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >TResult : TResult
 
     zip<TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>;
@@ -31,23 +31,23 @@ interface IEnumerable<T> {
 >T : T
 >index : number
 >TResult : TResult
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >TResult : TResult
 
     zip<TResult>(...params: any[]): IEnumerable<TResult>; // last one is selector
 >zip : { <TResult>(second: IEnumerable<T>, resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(second: T[], resultSelector: (first: T, second: T, index: number) => TResult): IEnumerable<TResult>; <TResult>(...params: any[]): IEnumerable<TResult>; }
 >TResult : TResult
 >params : any[]
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >TResult : TResult
 
     merge<TResult>(...params: IEnumerable<T>[]): IEnumerable<T>;
 >merge : { <TResult>(...params: IEnumerable<T>[]): IEnumerable<T>; <TResult>(...params: T[][]): IEnumerable<T>; }
 >TResult : TResult
 >params : IEnumerable<T>[]
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
     merge<TResult>(...params: T[][]): IEnumerable<T>;
@@ -55,45 +55,45 @@ interface IEnumerable<T> {
 >TResult : TResult
 >params : T[][]
 >T : T
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
 
     concat(...sequences: IEnumerable<T>[]): IEnumerable<T>;
 >concat : { (...sequences: IEnumerable<T>[]): IEnumerable<T>; (...sequences: T[]): IEnumerable<T>; }
 >sequences : IEnumerable<T>[]
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
     concat(...sequences: T[]): IEnumerable<T>;
 >concat : { (...sequences: IEnumerable<T>[]): IEnumerable<T>; (...sequences: T[]): IEnumerable<T>; }
 >sequences : T[]
 >T : T
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
     insert(index: number, second: IEnumerable<T>): IEnumerable<T>;
 >insert : (index: number, second: IEnumerable<T>) => IEnumerable<T>
 >index : number
 >second : IEnumerable<T>
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
     sequenceEqual(second: IEnumerable<T>): boolean;
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
 >second : IEnumerable<T>
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 
     sequenceEqual<TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean;
 >sequenceEqual : { (second: IEnumerable<T>): boolean; <TCompare>(second: IEnumerable<T>, compareSelector: (element: T) => TCompare): boolean; (second: T[]): boolean; <TCompare>(second: T[], compareSelector: (element: T) => TCompare): boolean; }
 >TCompare : TCompare
 >second : IEnumerable<T>
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >T : T
 >compareSelector : (element: T) => TCompare
 >element : T
@@ -122,7 +122,7 @@ interface IEnumerable<T> {
 >element : T
 >T : T
 >TKey : TKey
->IDictionary : IDictionary
+>IDictionary : IDictionary<TKey, TValue>
 >TKey : TKey
 
     toDictionary<TKey, TValue>(keySelector: (element: T) => TKey, elementSelector: (element: T) => TValue): IDictionary<TKey, TValue>;
@@ -137,7 +137,7 @@ interface IEnumerable<T> {
 >element : T
 >T : T
 >TValue : TValue
->IDictionary : IDictionary
+>IDictionary : IDictionary<TKey, TValue>
 >TKey : TKey
 >TValue : TValue
 
@@ -158,7 +158,7 @@ interface IEnumerable<T> {
 >key : TKey
 >TKey : TKey
 >TCompare : TCompare
->IDictionary : IDictionary
+>IDictionary : IDictionary<TKey, TValue>
 >TKey : TKey
 >TValue : TValue
 }
@@ -170,7 +170,7 @@ interface IDictionary<TKey, TValue> {
 
     toEnumerable(): IEnumerable<{ key: TKey; value: TValue }>;
 >toEnumerable : () => IEnumerable<{ key: TKey; value: TValue; }>
->IEnumerable : IEnumerable
+>IEnumerable : IEnumerable<T>
 >key : TKey
 >TKey : TKey
 >value : TValue
diff --git a/tests/baselines/reference/genericSpecializations1.types b/tests/baselines/reference/genericSpecializations1.types
index 35ab3472854..3b60a3b9987 100644
--- a/tests/baselines/reference/genericSpecializations1.types
+++ b/tests/baselines/reference/genericSpecializations1.types
@@ -13,7 +13,7 @@ interface IFoo<T> {
 
 class IntFooBad implements IFoo<number> {
 >IntFooBad : IntFooBad
->IFoo : IFoo
+>IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -22,7 +22,7 @@ class IntFooBad implements IFoo<number> {
 
 class StringFoo2 implements IFoo<string> {
 >StringFoo2 : StringFoo2
->IFoo : IFoo
+>IFoo : IFoo<T>
 
     foo(x: string): string { return null; }
 >foo : (x: string) => string
@@ -31,7 +31,7 @@ class StringFoo2 implements IFoo<string> {
 
 class StringFoo3 implements IFoo<string> {
 >StringFoo3 : StringFoo3
->IFoo : IFoo
+>IFoo : IFoo<T>
 
     foo<T>(x: T): T { return null; }
 >foo : <T>(x: T) => T
diff --git a/tests/baselines/reference/genericTypeArgumentInference1.types b/tests/baselines/reference/genericTypeArgumentInference1.types
index 6cc4f22bd9e..2c85dbe6846 100644
--- a/tests/baselines/reference/genericTypeArgumentInference1.types
+++ b/tests/baselines/reference/genericTypeArgumentInference1.types
@@ -23,7 +23,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.types b/tests/baselines/reference/genericTypeWithMultipleBases1.types
index 44e8ad8a295..c3bb692d9f2 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.types
@@ -27,7 +27,7 @@ export interface I3<T> extends I1, I2 {
  
 var x: I3<number>;
 >x : I3<number>
->I3 : I3
+>I3 : I3<T>
 
 x.p1;
 >x.p1 : number
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.types b/tests/baselines/reference/genericTypeWithMultipleBases2.types
index 292dcc55d99..a04e57075c3 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.types
@@ -26,7 +26,7 @@ export interface I3<T> extends I2, I1 {
  
 var x: I3<number>;
 >x : I3<number>
->I3 : I3
+>I3 : I3<T>
 
 x.p1;
 >x.p1 : number
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases3.types b/tests/baselines/reference/genericTypeWithMultipleBases3.types
index 6ece5a87be0..a0127b456bb 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases3.types
+++ b/tests/baselines/reference/genericTypeWithMultipleBases3.types
@@ -26,14 +26,14 @@ bar(x: T): T;
 interface IC<T> extends IA<T>, IB<T> { }
 >IC : IC<T>
 >T : T
->IA : IA
+>IA : IA<T>
 >T : T
->IB : IB
+>IB : IB<T>
 >T : T
 
 var c: IC<number>;
 >c : IC<number>
->IC : IC
+>IC : IC<T>
 
 var x = c.foo;
 >x : (x: number) => number
diff --git a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
index 3b16eda23e7..824ada50b89 100644
--- a/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
+++ b/tests/baselines/reference/genericWithCallSignatureReturningSpecialization.types
@@ -5,7 +5,7 @@ interface B<T> {
 
     f(): B<number>;
 >f : () => B<number>
->B : B
+>B : B<T>
 
     (value: T): void;
 >value : T
@@ -13,7 +13,7 @@ interface B<T> {
 }
 var x: B<boolean>;
 >x : B<boolean>
->B : B
+>B : B<T>
 
 x(true); // was error
 >x(true) : void
diff --git a/tests/baselines/reference/genericWithCallSignatures1.types b/tests/baselines/reference/genericWithCallSignatures1.types
index c88b2f1c1b1..b55b4bbc64b 100644
--- a/tests/baselines/reference/genericWithCallSignatures1.types
+++ b/tests/baselines/reference/genericWithCallSignatures1.types
@@ -5,7 +5,7 @@ class MyClass {
 
     public callableThing: CallableExtention<string>;
 >callableThing : CallableExtention<string>
->CallableExtention : CallableExtention
+>CallableExtention : CallableExtention<T>
 
     public myMethod() {
 >myMethod : () => void
@@ -35,6 +35,6 @@ interface Callable<T> {
 interface CallableExtention<T> extends Callable<T> { }
 >CallableExtention : CallableExtention<T>
 >T : T
->Callable : Callable
+>Callable : Callable<T>
 >T : T
 
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
index 1c4616211e7..1de9b6d2aa8 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.types
@@ -12,7 +12,7 @@ export class Collection<TItem extends CollectionItem> {
 
 export class List extends Collection<ListItem>{
 >List : List
->Collection : Collection
+>Collection : Collection<TItem>
 >ListItem : ListItem
 
     Bar() {}
diff --git a/tests/baselines/reference/generics0.types b/tests/baselines/reference/generics0.types
index 1c7aa3d54b4..2febb5bd808 100644
--- a/tests/baselines/reference/generics0.types
+++ b/tests/baselines/reference/generics0.types
@@ -10,7 +10,7 @@ interface G<T> {
 
 var v2: G<string>;
 >v2 : G<string>
->G : G
+>G : G<T>
 
 var z = v2.x; // 'y' should be of type 'string'
 >z : string
diff --git a/tests/baselines/reference/generics1NoError.types b/tests/baselines/reference/generics1NoError.types
index 54a38bed8a5..409517b56ce 100644
--- a/tests/baselines/reference/generics1NoError.types
+++ b/tests/baselines/reference/generics1NoError.types
@@ -29,20 +29,20 @@ interface G<T, U extends B> {
 }
 var v1: G<A, C>;               // Ok
 >v1 : G<A, C>
->G : G
+>G : G<T, U>
 >A : A
 >C : C
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G
+>G : G<T, U>
 >a : string
 >C : C
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G
->G : G
+>G : G<T, U>
+>G : G<T, U>
 >A : A
 >B : B
 >C : C
diff --git a/tests/baselines/reference/generics2NoError.types b/tests/baselines/reference/generics2NoError.types
index 059419629f5..6b6d526e4b2 100644
--- a/tests/baselines/reference/generics2NoError.types
+++ b/tests/baselines/reference/generics2NoError.types
@@ -47,14 +47,14 @@ var v1: {
 
 var v2: G<{ a: string }, C>;   // Ok, equivalent to G<A, C>
 >v2 : G<{ a: string; }, C>
->G : G
+>G : G<T, U>
 >a : string
 >C : C
 
 var v4: G<G<A, B>, C>;         // Ok
 >v4 : G<G<A, B>, C>
->G : G
->G : G
+>G : G<T, U>
+>G : G<T, U>
 >A : A
 >B : B
 >C : C
diff --git a/tests/baselines/reference/generics3.types b/tests/baselines/reference/generics3.types
index 11477fedd85..510dcbfeaf8 100644
--- a/tests/baselines/reference/generics3.types
+++ b/tests/baselines/reference/generics3.types
@@ -15,12 +15,12 @@ interface Y { f(): string; }
 
 var a: C<X>;
 >a : C<X>
->C : C
+>C : C<T>
 >X : X
 
 var b: C<Y>;
 >b : C<Y>
->C : C
+>C : C<T>
 >Y : Y
 
 a = b; // Ok - should be identical
diff --git a/tests/baselines/reference/generics4NoError.types b/tests/baselines/reference/generics4NoError.types
index 2dd37a5d447..c22b1905e44 100644
--- a/tests/baselines/reference/generics4NoError.types
+++ b/tests/baselines/reference/generics4NoError.types
@@ -15,11 +15,11 @@ interface Y { f(): boolean; }
 
 var a: C<X>;
 >a : C<X>
->C : C
+>C : C<T>
 >X : X
 
 var b: C<Y>;
 >b : C<Y>
->C : C
+>C : C<T>
 >Y : Y
 
diff --git a/tests/baselines/reference/icomparable.types b/tests/baselines/reference/icomparable.types
index b88c11caf85..2766743f41f 100644
--- a/tests/baselines/reference/icomparable.types
+++ b/tests/baselines/reference/icomparable.types
@@ -12,14 +12,14 @@
     declare function sort<U extends IComparable<any>>(items: U[]): U[];
 >sort : <U extends IComparable<any>>(items: U[]) => U[]
 >U : U
->IComparable : IComparable
+>IComparable : IComparable<T>
 >items : U[]
 >U : U
 >U : U
 
     interface StringComparable extends IComparable<string> {
 >StringComparable : StringComparable
->IComparable : IComparable
+>IComparable : IComparable<T>
     }
 
     var sc: StringComparable[];
diff --git a/tests/baselines/reference/identicalCallSignatures2.types b/tests/baselines/reference/identicalCallSignatures2.types
index a8a48f52445..febe2f38d8b 100644
--- a/tests/baselines/reference/identicalCallSignatures2.types
+++ b/tests/baselines/reference/identicalCallSignatures2.types
@@ -12,12 +12,12 @@ interface Base<T> {
 
 interface I extends Base<string>, Base<number> { }
 >I : I
->Base : Base
->Base : Base
+>Base : Base<T>
+>Base : Base<T>
 
 interface I2<T> extends Base<string>, Base<number> { }
 >I2 : I2<T>
 >T : T
->Base : Base
->Base : Base
+>Base : Base<T>
+>Base : Base<T>
 
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index a03d9d60270..46663086532 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -35,13 +35,13 @@ class D<T>{
 
     recurse: D<T>;
 >recurse : D<T>
->D : D
+>D : D<T>
 >T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D
->D : D
+>D : D<T>
+>D : D<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/illegalGenericWrapping1.types b/tests/baselines/reference/illegalGenericWrapping1.types
index 27c34ec5a55..82de593104c 100644
--- a/tests/baselines/reference/illegalGenericWrapping1.types
+++ b/tests/baselines/reference/illegalGenericWrapping1.types
@@ -16,7 +16,7 @@ interface Sequence<T> {
 >value : T
 >T : T
 >U : U
->Sequence : Sequence
+>Sequence : Sequence<T>
 >U : U
 
     filter(iterator: (value: T) => boolean): Sequence<T>;
@@ -24,7 +24,7 @@ interface Sequence<T> {
 >iterator : (value: T) => boolean
 >value : T
 >T : T
->Sequence : Sequence
+>Sequence : Sequence<T>
 >T : T
 
     groupBy<K>(keySelector: (value: T) => K): Sequence<{ key: K; items: Sequence<T>; }>;
@@ -34,11 +34,11 @@ interface Sequence<T> {
 >value : T
 >T : T
 >K : K
->Sequence : Sequence
+>Sequence : Sequence<T>
 >key : K
 >K : K
 >items : Sequence<T>
->Sequence : Sequence
+>Sequence : Sequence<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/implementArrayInterface.types b/tests/baselines/reference/implementArrayInterface.types
index bf872eb2761..68d192cee6f 100644
--- a/tests/baselines/reference/implementArrayInterface.types
+++ b/tests/baselines/reference/implementArrayInterface.types
@@ -2,7 +2,7 @@
 declare class ArrayConstructor<T> implements Array<T> {
 >ArrayConstructor : ArrayConstructor<T>
 >T : T
->Array : Array
+>Array : T[]
 >T : T
 
     toString(): string;
diff --git a/tests/baselines/reference/implicitAnyGenerics.types b/tests/baselines/reference/implicitAnyGenerics.types
index bab4219a90a..91a231e3f12 100644
--- a/tests/baselines/reference/implicitAnyGenerics.types
+++ b/tests/baselines/reference/implicitAnyGenerics.types
@@ -26,7 +26,7 @@ var c3 = new C<number>();
 
 var c4: C<any> = new C();
 >c4 : C<any>
->C : C
+>C : C<T>
 >new C() : C<{}>
 >C : typeof C
 
@@ -62,7 +62,7 @@ var d4 = new D(<any>1);
 
 var d5: D<any> = new D(null);
 >d5 : D<any>
->D : D
+>D : D<T>
 >new D(null) : D<any>
 >D : typeof D
 
diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types
index 0ccb60427e6..ee9715ef495 100644
--- a/tests/baselines/reference/importAliasIdentifiers.types
+++ b/tests/baselines/reference/importAliasIdentifiers.types
@@ -61,7 +61,7 @@ import clolias = clodule;
 
 var p: clolias.Point;
 >p : Point
->clolias : clolias
+>clolias : clodule
 >Point : Point
 
 var p: clodule.Point;
diff --git a/tests/baselines/reference/importAliasWithDottedName.types b/tests/baselines/reference/importAliasWithDottedName.types
index 29ef8a54baa..ab316fade5c 100644
--- a/tests/baselines/reference/importAliasWithDottedName.types
+++ b/tests/baselines/reference/importAliasWithDottedName.types
@@ -18,7 +18,7 @@ module A {
 
     import N = M.N;
 >N : typeof N
->M : typeof N
+>M : typeof M
 >N : typeof N
 
     var r = N.y;
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.types b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
index f3d76d7ac01..eb4f354a4dc 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.types
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
@@ -8,7 +8,7 @@ module m {
 
 import x = m.m;
 >x : string
->m : string
+>m : typeof m
 >m : string
 
 class C {
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 2adeb194f47..0b53cbdd043 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -9,11 +9,11 @@ declare module "m" {
     }
     export import a = x.c;
 >a : a
->x : c
+>x : x
 >c : c
 
     var b: a;
 >b : c
->a : a
+>a : c
 }
 
diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.types b/tests/baselines/reference/importOnAliasedIdentifiers.types
index d91180705c3..187e7ceb97f 100644
--- a/tests/baselines/reference/importOnAliasedIdentifiers.types
+++ b/tests/baselines/reference/importOnAliasedIdentifiers.types
@@ -19,15 +19,15 @@ module B {
 
     import Y = A; // Alias only for module A
 >Y : typeof A
->A : typeof A
+>A : A
 
     import Z = A.X; // Alias for both type and member A.X
 >Z : X
->A : X
+>A : A
 >X : X
 
     var v: Z = Z;
 >v : X
->Z : Z
+>Z : X
 >Z : X
 }
diff --git a/tests/baselines/reference/importShadowsGlobalName.types b/tests/baselines/reference/importShadowsGlobalName.types
index 35bbf6aa068..fd333fc412b 100644
--- a/tests/baselines/reference/importShadowsGlobalName.types
+++ b/tests/baselines/reference/importShadowsGlobalName.types
@@ -4,7 +4,7 @@ import Error = require('Foo');
 
 class Bar extends Error {}
 >Bar : Bar
->Error : Error
+>Error : Foo
 
 export = Bar;
 >Bar : Bar
diff --git a/tests/baselines/reference/import_reference-exported-alias.types b/tests/baselines/reference/import_reference-exported-alias.types
index 275872c2970..e1dffabba5a 100644
--- a/tests/baselines/reference/import_reference-exported-alias.types
+++ b/tests/baselines/reference/import_reference-exported-alias.types
@@ -4,12 +4,12 @@ import appJs = require("file1");
 
 import Services = appJs.Services;
 >Services : typeof Services
->appJs : typeof Services
+>appJs : typeof App
 >Services : typeof Services
 
 import UserServices = Services.UserServices;
 >UserServices : typeof UserServices
->Services : UserServices
+>Services : typeof Services
 >UserServices : UserServices
 
 var x = new UserServices().getUserName();
diff --git a/tests/baselines/reference/import_reference-to-type-alias.types b/tests/baselines/reference/import_reference-to-type-alias.types
index 5dad3fbedb9..6f9628f277a 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.types
+++ b/tests/baselines/reference/import_reference-to-type-alias.types
@@ -4,8 +4,8 @@ import appJs = require("file1");
 
 import Services = appJs.App.Services;
 >Services : typeof Services
->appJs : typeof Services
->App : typeof Services
+>appJs : typeof "tests/cases/compiler/file1"
+>App : typeof App
 >Services : typeof Services
 
 var x = new Services.UserServices().getUserName();
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
index 707df8da5b6..1f7c10e0768 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
@@ -5,7 +5,7 @@ import ITest = require('ITest');
 
 var testData: ITest[];
 >testData : Name[]
->ITest : ITest
+>ITest : Name
 
 var p = testData[0].name;
 >p : string
diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types
index 4aa37429c9e..907626d345b 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/importedModuleClassNameClash.ts ===
 import foo = m1;
 >foo : typeof foo
->m1 : foo
+>m1 : m1
  
 export module m1 { }
 >m1 : m1
diff --git a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
index 65b4e1862e0..06416e6b02d 100644
--- a/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
+++ b/tests/baselines/reference/infiniteExpandingTypeThroughInheritanceInstantiation.types
@@ -5,21 +5,21 @@ interface A<T>
 {
    x: A<B<T>>
 >x : A<B<T>>
->A : A
->B : B
+>A : A<T>
+>B : B<T>
 >T : T
 }
 
 interface B<T> extends A<T> // error
 >B : B<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
 {
    x: B<A<T>>
 >x : B<A<T>>
->B : B
->A : A
+>B : B<T>
+>A : A<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
index 8ef6cc60d2e..df818833aa0 100644
--- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
+++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
@@ -5,8 +5,8 @@ interface G<T> {
 
     x: G<G<T>> // infinitely expanding type reference
 >x : G<G<T>>
->G : G
->G : G
+>G : G<T>
+>G : G<T>
 >T : T
 
     y: T
@@ -18,7 +18,7 @@ function ff<T>(g: G<T>): void {
 >ff : <T>(g: G<T>) => void
 >T : T
 >g : G<T>
->G : G
+>G : G<T>
 >T : T
 
     ff(g) // when infering T here we need to make sure to not descend into the structure of G<T> infinitely
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes1.types b/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
index d53afa0b5b1..a1d87a4a807 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes1.types
@@ -5,8 +5,8 @@ interface A<T>
 {
     x : A<A<T>>
 >x : A<A<T>>
->A : A
->A : A
+>A : A<T>
+>A : A<T>
 >T : T
 }
  
@@ -16,16 +16,16 @@ interface B<T>
 {
     x : B<T>
 >x : B<T>
->B : B
+>B : B<T>
 >T : T
 }
  
 interface C<T> extends A<T>, B<T> { }
 >C : C<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
->B : B
+>B : B<T>
 >T : T
 
  
diff --git a/tests/baselines/reference/infinitelyExpandingBaseTypes2.types b/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
index 6ac75868829..8b258f5b2be 100644
--- a/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
+++ b/tests/baselines/reference/infinitelyExpandingBaseTypes2.types
@@ -5,7 +5,7 @@ interface A<T>
 {
    x : A<()=>T>
 >x : A<() => T>
->A : A
+>A : A<T>
 >T : T
 }
  
@@ -15,16 +15,16 @@ interface B<T>
 {
    x : B<()=>T>
 >x : B<() => T>
->B : B
+>B : B<T>
 >T : T
 }
  
 var a: A<string>
 >a : A<string>
->A : A
+>A : A<T>
 
 var b: B<string> = a
 >b : B<string>
->B : B
+>B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypeAssignability.types b/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
index d3deb38aeb4..c145a60cdf1 100644
--- a/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
+++ b/tests/baselines/reference/infinitelyExpandingTypeAssignability.types
@@ -11,27 +11,27 @@ interface A<T> {
 interface B<T> extends A<B<B<B<T>>>> { }
 >B : B<T>
 >T : T
->A : A
->B : B
->B : B
->B : B
+>A : A<T>
+>B : B<T>
+>B : B<T>
+>B : B<T>
 >T : T
 
 interface C<T> extends A<C<C<C<T>>>> { }
 >C : C<T>
 >T : T
->A : A
->C : C
->C : C
->C : C
+>A : A<T>
+>C : C<T>
+>C : C<T>
+>C : C<T>
 >T : T
  
 var x : B<string>
 >x : B<string>
->B : B
+>B : B<T>
 
 var y : C<string> = x
 >y : C<string>
->C : C
+>C : C<T>
 >x : B<string>
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypes3.types b/tests/baselines/reference/infinitelyExpandingTypes3.types
index 2836a9b5dbd..b63c8796253 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes3.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes3.types
@@ -9,20 +9,20 @@ interface List<T> {
 
     next: List<T>; // will be recursive reference when OwnerList is expanded
 >next : List<T>
->List : List
+>List : List<T>
 >T : T
 
     owner: OwnerList<T>;
 >owner : OwnerList<T>
->OwnerList : OwnerList
+>OwnerList : OwnerList<U>
 >T : T
 }
 
 interface OwnerList<U> extends List<List<U>> {
 >OwnerList : OwnerList<U>
 >U : U
->List : List
->List : List
+>List : List<T>
+>List : List<T>
 >U : U
 
     name: string;
@@ -32,8 +32,8 @@ interface OwnerList<U> extends List<List<U>> {
 interface OwnerList2<U> extends List<List<U>> {
 >OwnerList2 : OwnerList2<U>
 >U : U
->List : List
->List : List
+>List : List<T>
+>List : List<T>
 >U : U
 
     name: string;
@@ -42,11 +42,11 @@ interface OwnerList2<U> extends List<List<U>> {
 
 var o1: OwnerList<number>;
 >o1 : OwnerList<number>
->OwnerList : OwnerList
+>OwnerList : OwnerList<U>
 
 var o2: OwnerList2<number>;
 >o2 : OwnerList2<number>
->OwnerList2 : OwnerList2
+>OwnerList2 : OwnerList2<U>
 
 o1 = o2; // should not error
 >o1 = o2 : OwnerList2<number>
diff --git a/tests/baselines/reference/infinitelyExpandingTypes4.types b/tests/baselines/reference/infinitelyExpandingTypes4.types
index 17aefd34f99..7309d709561 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes4.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes4.types
@@ -11,8 +11,8 @@ interface Query<T> {
 >item : T
 >T : T
 >K : K
->Query : Query
->Grouping : Grouping
+>Query : Query<T>
+>Grouping : Grouping<K, T>
 >K : K
 >T : T
 
@@ -31,8 +31,8 @@ interface QueryEnumerator<T> {
 >item : T
 >T : T
 >K : K
->QueryEnumerator : QueryEnumerator
->Grouping : Grouping
+>QueryEnumerator : QueryEnumerator<T>
+>Grouping : Grouping<K, T>
 >K : K
 >T : T
 
@@ -43,7 +43,7 @@ interface Grouping<K, T> extends Query<T> {
 >Grouping : Grouping<K, T>
 >K : K
 >T : T
->Query : Query
+>Query : Query<T>
 >T : T
 
     key(): K;
@@ -53,15 +53,15 @@ interface Grouping<K, T> extends Query<T> {
 
 var q1: Query<number>;
 >q1 : Query<number>
->Query : Query
+>Query : Query<T>
 
 var q2: QueryEnumerator<number>;
 >q2 : QueryEnumerator<number>
->QueryEnumerator : QueryEnumerator
+>QueryEnumerator : QueryEnumerator<T>
 
 var q3: Query<number>;
 >q3 : Query<number>
->Query : Query
+>Query : Query<T>
 
 q1 = q2; // should error
 >q1 = q2 : QueryEnumerator<number>
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.types b/tests/baselines/reference/infinitelyExpandingTypes5.types
index d0d0420ab90..f145ff9539f 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.types
@@ -7,7 +7,7 @@ interface Query<T> {
 >foo : (x: T) => Query<T[]>
 >x : T
 >T : T
->Query : Query
+>Query : Query<T>
 >T : T
 }
 
@@ -27,16 +27,16 @@ function from<T>(array: T[]): Query<T>;
 >T : T
 >array : T[]
 >T : T
->Query : Query
+>Query : Query<T>
 >T : T
 
 function from<T>(enumerator: Enumerator<T>): Query<T>;
 >from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
 >T : T
 >enumerator : Enumerator<T>
->Enumerator : Enumerator
+>Enumerator : Enumerator<T>
 >T : T
->Query : Query
+>Query : Query<T>
 >T : T
 
 function from(arg: any): any {
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
index bd70c1b8a77..9190ef15779 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
@@ -5,7 +5,7 @@ class Functionality<V> {
 
     property: Options<V>;
 >property : Options<V>
->Options : Options
+>Options : Options<T>
 >V : V
 }
 
@@ -20,8 +20,8 @@ class A<T> extends Base {
 
     options: Options<Functionality<T>[]>;
 >options : Options<Functionality<T>[]>
->Options : Options
->Functionality : Functionality
+>Options : Options<T>
+>Functionality : Functionality<V>
 >T : T
 }
 
@@ -31,14 +31,14 @@ interface OptionsBase<T> {
 
     Options: Options<T>;
 >Options : Options<T>
->Options : Options
+>Options : Options<T>
 >T : T
 }
 
 interface Options<T> extends OptionsBase<T> {
 >Options : Options<T>
 >T : T
->OptionsBase : OptionsBase
+>OptionsBase : OptionsBase<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/infinitelyGenerativeInheritance1.types b/tests/baselines/reference/infinitelyGenerativeInheritance1.types
index 024ee04baad..e46262d56bc 100644
--- a/tests/baselines/reference/infinitelyGenerativeInheritance1.types
+++ b/tests/baselines/reference/infinitelyGenerativeInheritance1.types
@@ -11,9 +11,9 @@ interface Stack<T> {
 >zip : <S>(a: Stack<S>) => Stack<{ x: T; y: S; }>
 >S : S
 >a : Stack<S>
->Stack : Stack
+>Stack : Stack<T>
 >S : S
->Stack : Stack
+>Stack : Stack<T>
 >x : T
 >T : T
 >y : S
@@ -23,16 +23,16 @@ interface Stack<T> {
 interface MyStack<T> extends Stack<T> {
 >MyStack : MyStack<T>
 >T : T
->Stack : Stack
+>Stack : Stack<T>
 >T : T
 
       zip<S>(a: Stack<S>): Stack<{ x: T; y: S }>
 >zip : <S>(a: Stack<S>) => Stack<{ x: T; y: S; }>
 >S : S
 >a : Stack<S>
->Stack : Stack
+>Stack : Stack<T>
 >S : S
->Stack : Stack
+>Stack : Stack<T>
 >x : T
 >T : T
 >y : S
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
index 7ffd61af7cb..d18b02ec8d0 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod1.types
@@ -6,7 +6,7 @@ class A<T> { }
 class B<T> extends A<T> {}
 >B : B<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
 
 var a = new A<Date>();
@@ -22,7 +22,7 @@ var b1 = new B(); // no error
 
 var b2: B<Date> = new B<Date>(); // no error
 >b2 : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 >new B<Date>() : B<Date>
 >B : typeof B
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
index 85e8e068146..0b1e89012af 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
@@ -21,7 +21,7 @@ module N {
 >D2 : D2<T>
 >T : T
 >M : M
->C2 : C2
+>C2 : C2<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/inheritedGenericCallSignature.types b/tests/baselines/reference/inheritedGenericCallSignature.types
index 0204c75918f..4382320862b 100644
--- a/tests/baselines/reference/inheritedGenericCallSignature.types
+++ b/tests/baselines/reference/inheritedGenericCallSignature.types
@@ -20,7 +20,7 @@ interface Object {}
 interface I2<T> extends I1<T[]> {
 >I2 : I2<T>
 >T : T
->I1 : I1
+>I1 : I1<T>
 >T : T
 
     b: T;
@@ -33,7 +33,7 @@ interface I2<T> extends I1<T[]> {
 
 var x: I2<Date>;
 >x : I2<Date>
->I2 : I2
+>I2 : I2<T>
 >Date : Date
 
  
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
index 6d927feef1b..2899e964efd 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.types
@@ -18,5 +18,5 @@ interface B {
 interface C extends B, A<string> { } // Should succeed
 >C : C
 >B : B
->A : A
+>A : A<T>
 
diff --git a/tests/baselines/reference/innerTypeArgumentInference.types b/tests/baselines/reference/innerTypeArgumentInference.types
index 1bc46c44efe..759b78aa75f 100644
--- a/tests/baselines/reference/innerTypeArgumentInference.types
+++ b/tests/baselines/reference/innerTypeArgumentInference.types
@@ -8,7 +8,7 @@ function Generate<U>(func: Generator<U>): U {
 >Generate : <U>(func: Generator<U>) => U
 >U : U
 >func : Generator<U>
->Generator : Generator
+>Generator : Generator<T>
 >U : U
 >U : U
 
diff --git a/tests/baselines/reference/instanceSubtypeCheck1.types b/tests/baselines/reference/instanceSubtypeCheck1.types
index 154c608dda4..f5c127e0025 100644
--- a/tests/baselines/reference/instanceSubtypeCheck1.types
+++ b/tests/baselines/reference/instanceSubtypeCheck1.types
@@ -5,20 +5,20 @@ interface A<T>
 {
    x: A<B<T>>
 >x : A<B<T>>
->A : A
->B : B
+>A : A<T>
+>B : B<T>
 >T : T
 }
  
 interface B<T> extends A<T>
 >B : B<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
 {
    x: B<A<T>>
 >x : B<A<T>>
->B : B
->A : A
+>B : B<T>
+>A : A<T>
 >T : T
 }
diff --git a/tests/baselines/reference/instantiatedReturnTypeContravariance.types b/tests/baselines/reference/instantiatedReturnTypeContravariance.types
index e5145abf455..8b7cb7b609e 100644
--- a/tests/baselines/reference/instantiatedReturnTypeContravariance.types
+++ b/tests/baselines/reference/instantiatedReturnTypeContravariance.types
@@ -17,7 +17,7 @@ class c {
 
 foo(): B<void> {
 >foo : () => B<void>
->B : B
+>B : B<T>
 
 return null;
 
@@ -31,7 +31,7 @@ class d extends c {
 
 foo(): B<number> {
 >foo : () => B<number>
->B : B
+>B : B<T>
 
 return null;
 
diff --git a/tests/baselines/reference/interface0.types b/tests/baselines/reference/interface0.types
index 41f668e79ca..ecbd2d212ed 100644
--- a/tests/baselines/reference/interface0.types
+++ b/tests/baselines/reference/interface0.types
@@ -10,7 +10,7 @@ interface Generic<T> {
 
 var y: Generic<number> = { x: 3 };
 >y : Generic<number>
->Generic : Generic
+>Generic : Generic<T>
 >{ x: 3 } : { x: number; }
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasClass.types b/tests/baselines/reference/internalAliasClass.types
index 7315fc16ecc..2a026c713ed 100644
--- a/tests/baselines/reference/internalAliasClass.types
+++ b/tests/baselines/reference/internalAliasClass.types
@@ -12,12 +12,12 @@ module c {
 
     import b = a.c;
 >b : typeof c
->a : c
+>a : typeof a
 >c : c
 
     export var x: b = new b();
 >x : c
->b : b
+>b : c
 >new b() : c
 >b : typeof c
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
index bdc08525865..54f69cf2f39 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
@@ -23,7 +23,7 @@ export module m2 {
 
         export import c = x.c;
 >c : typeof c
->x : c
+>x : typeof x
 >c : c
 
         export var cProp = new c();
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
index a2de11b3a4b..4f916d5689c 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
@@ -23,7 +23,7 @@ export module m2 {
 
         import c = x.c;
 >c : typeof c
->x : c
+>x : typeof x
 >c : c
 
         export var cProp = new c();
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
index ea12761ba2c..a9edf4684c4 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
@@ -17,7 +17,7 @@ export module x {
 
 export import xc = x.c;
 >xc : typeof c
->x : c
+>x : typeof x
 >c : c
 
 export var cProp = new xc();
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
index a531d528ff7..05309a8f844 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
@@ -17,7 +17,7 @@ export module x {
 
 import xc = x.c;
 >xc : typeof c
->x : c
+>x : typeof x
 >c : c
 
 export var cProp = new xc();
diff --git a/tests/baselines/reference/internalAliasEnum.types b/tests/baselines/reference/internalAliasEnum.types
index 54b8df5ae49..8b4706b67f3 100644
--- a/tests/baselines/reference/internalAliasEnum.types
+++ b/tests/baselines/reference/internalAliasEnum.types
@@ -21,12 +21,12 @@ module c {
 
     import b = a.weekend;
 >b : typeof weekend
->a : weekend
+>a : typeof a
 >weekend : weekend
 
     export var bVal: b = b.Sunday;
 >bVal : weekend
->b : b
+>b : weekend
 >b.Sunday : weekend
 >b : typeof weekend
 >Sunday : weekend
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
index e2790db70d5..e990dc2d5e9 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
@@ -21,12 +21,12 @@ export module c {
 
     export import b = a.weekend;
 >b : typeof weekend
->a : weekend
+>a : typeof a
 >weekend : weekend
 
     export var bVal: b = b.Sunday;
 >bVal : weekend
->b : b
+>b : weekend
 >b.Sunday : weekend
 >b : typeof weekend
 >Sunday : weekend
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
index a8b0528ecb7..1182ea3d4f3 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
@@ -21,12 +21,12 @@ export module c {
 
     import b = a.weekend;
 >b : typeof weekend
->a : weekend
+>a : typeof a
 >weekend : weekend
 
     export var bVal: b = b.Sunday;
 >bVal : weekend
->b : b
+>b : weekend
 >b.Sunday : weekend
 >b : typeof weekend
 >Sunday : weekend
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
index bc4e2af89cb..8fd15e4e210 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
@@ -18,12 +18,12 @@ export module a {
 
 export import b = a.weekend;
 >b : typeof weekend
->a : weekend
+>a : typeof a
 >weekend : weekend
 
 export var bVal: b = b.Sunday;
 >bVal : weekend
->b : b
+>b : weekend
 >b.Sunday : weekend
 >b : typeof weekend
 >Sunday : weekend
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
index d9ffa38d3ab..09ee904abb6 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
@@ -18,12 +18,12 @@ export module a {
 
 import b = a.weekend;
 >b : typeof weekend
->a : weekend
+>a : typeof a
 >weekend : weekend
 
 export var bVal: b = b.Sunday;
 >bVal : weekend
->b : b
+>b : weekend
 >b.Sunday : weekend
 >b : typeof weekend
 >Sunday : weekend
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index 77a6546d166..ed297ce1b4e 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -16,7 +16,7 @@ module c {
 
     import b = a.foo;
 >b : (x: number) => number
->a : (x: number) => number
+>a : typeof a
 >foo : (x: number) => number
 
     export var bVal = b(10);
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index ffeedf43e92..b3140e7b09a 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -16,7 +16,7 @@ export module c {
 
     export import b = a.foo;
 >b : (x: number) => number
->a : (x: number) => number
+>a : typeof a
 >foo : (x: number) => number
 
     export var bVal = b(10);
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index 8ca1000f970..c78b5040495 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -16,7 +16,7 @@ export module c {
 
     import b = a.foo;
 >b : (x: number) => number
->a : (x: number) => number
+>a : typeof a
 >foo : (x: number) => number
 
     var bVal = b(10);
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index 570ab7a0e85..365f0edeb27 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -13,7 +13,7 @@ export module a {
 
 export import b = a.foo;
 >b : (x: number) => number
->a : (x: number) => number
+>a : typeof a
 >foo : (x: number) => number
 
 export var bVal = b(10);
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index 40680a5d894..c2f06c66f76 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -13,7 +13,7 @@ export module a {
 
 import b = a.foo;
 >b : (x: number) => number
->a : (x: number) => number
+>a : typeof a
 >foo : (x: number) => number
 
 export var bVal = b(10);
diff --git a/tests/baselines/reference/internalAliasInitializedModule.types b/tests/baselines/reference/internalAliasInitializedModule.types
index dcd5e728030..44d376e913e 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.types
+++ b/tests/baselines/reference/internalAliasInitializedModule.types
@@ -16,7 +16,7 @@ module c {
 
     import b = a.b;
 >b : typeof b
->a : typeof b
+>a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
index e9ab37ad589..3dfee66924a 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
@@ -16,7 +16,7 @@ export module c {
 
     export import b = a.b;
 >b : typeof b
->a : typeof b
+>a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
index 8a78877c962..4e78a0d7816 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
@@ -16,7 +16,7 @@ export module c {
 
     import b = a.b;
 >b : typeof b
->a : typeof b
+>a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
index e67c2110e01..a7d7d1937cd 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
@@ -13,7 +13,7 @@ export module a {
 
 export import b = a.b;
 >b : typeof b
->a : typeof b
+>a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
index e76c848674b..ffd30968316 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -13,7 +13,7 @@ export module a {
 
 import b = a.b;
 >b : typeof b
->a : typeof b
+>a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
diff --git a/tests/baselines/reference/internalAliasInterface.types b/tests/baselines/reference/internalAliasInterface.types
index 5a7d30d9882..71a59027d83 100644
--- a/tests/baselines/reference/internalAliasInterface.types
+++ b/tests/baselines/reference/internalAliasInterface.types
@@ -12,11 +12,11 @@ module c {
 
     import b = a.I;
 >b : b
->a : I
+>a : a
 >I : I
 
     export var x: b;
 >x : I
->b : b
+>b : I
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
index 023ee951af8..253a778ea3e 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
@@ -12,11 +12,11 @@ export module c {
 
     export import b = a.I;
 >b : b
->a : I
+>a : a
 >I : I
 
     export var x: b;
 >x : I
->b : b
+>b : I
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
index 7a01e00fbff..ec1e59fd946 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
@@ -12,11 +12,11 @@ export module c {
 
     import b = a.I;
 >b : b
->a : I
+>a : a
 >I : I
 
     export var x: b;
 >x : I
->b : b
+>b : I
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
index dd662b1541c..686eba773b1 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
@@ -9,10 +9,10 @@ export module a {
 
 export import b = a.I;
 >b : b
->a : I
+>a : a
 >I : I
 
 export var x: b;
 >x : I
->b : b
+>b : I
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
index aa11f53c3ad..56197b88a1f 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
@@ -9,10 +9,10 @@ export module a {
 
 import b = a.I;
 >b : b
->a : I
+>a : a
 >I : I
 
 export var x: b;
 >x : I
->b : b
+>b : I
 
diff --git a/tests/baselines/reference/internalAliasVar.types b/tests/baselines/reference/internalAliasVar.types
index abfd384d3d1..d284b064d83 100644
--- a/tests/baselines/reference/internalAliasVar.types
+++ b/tests/baselines/reference/internalAliasVar.types
@@ -11,7 +11,7 @@ module c {
 
     import b = a.x;
 >b : number
->a : number
+>a : typeof a
 >x : number
 
     export var bVal = b;
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
index 72bcb43d8c1..b8d94c9ebbd 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
@@ -11,7 +11,7 @@ export module c {
 
     export import b = a.x;
 >b : number
->a : number
+>a : typeof a
 >x : number
 
     export var bVal = b;
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
index 34669c93000..c9e2897befb 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
@@ -11,7 +11,7 @@ export module c {
 
     import b = a.x;
 >b : number
->a : number
+>a : typeof a
 >x : number
 
     export var bVal = b;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
index 0a3488929dd..22335c7d8c0 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
@@ -8,7 +8,7 @@ export module a {
 
 export import b = a.x;
 >b : number
->a : number
+>a : typeof a
 >x : number
 
 export var bVal = b;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
index b761d58f225..1474735c62d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
@@ -8,7 +8,7 @@ export module a {
 
 import b = a.x;
 >b : number
->a : number
+>a : typeof a
 >x : number
 
 export var bVal = b;
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.types b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
index cda70b9a32b..8677bb41138 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.types
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
@@ -14,7 +14,7 @@ module a.e.f {
 
       import g = b.c;
 >g : typeof c
->b : typeof c
+>b : typeof b
 >c : typeof c
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
index 01549965a13..b961f93fc8c 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
@@ -15,6 +15,6 @@ module B {
 
     import Y = A;
 >Y : Y
->A : A
+>A : number
 }
 
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index 7dac9383e39..1cb5bcecc34 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -13,17 +13,17 @@ declare module Windows.Foundation {
 >success : (value: T) => IPromise<U>
 >value : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -32,7 +32,7 @@ declare module Windows.Foundation {
 >success : (value: T) => IPromise<U>
 >value : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >error : (error: any) => U
 >error : any
@@ -41,7 +41,7 @@ declare module Windows.Foundation {
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -53,13 +53,13 @@ declare module Windows.Foundation {
 >U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -76,7 +76,7 @@ declare module Windows.Foundation {
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         done<U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
@@ -100,7 +100,7 @@ var p: Windows.Foundation.IPromise<string>;
 >p : IPromise<string>
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 
 var p2 = p.then(function (s) {
 >p2 : IPromise<number>
diff --git a/tests/baselines/reference/ipromise3.types b/tests/baselines/reference/ipromise3.types
index 0d2eb3d6d7a..4750dd4b6ce 100644
--- a/tests/baselines/reference/ipromise3.types
+++ b/tests/baselines/reference/ipromise3.types
@@ -9,15 +9,15 @@ interface IPromise3<T> {
 >success : (value: T) => IPromise3<U>
 >value : T
 >T : T
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 >error : (error: any) => IPromise3<U>
 >error : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 
     then<U>(success?: (value: T) => IPromise3<U>, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
@@ -26,14 +26,14 @@ interface IPromise3<T> {
 >success : (value: T) => IPromise3<U>
 >value : T
 >T : T
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 >error : (error: any) => U
 >error : any
 >U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => IPromise3<U>, progress?: (progress: any) => void ): IPromise3<U>;
@@ -45,11 +45,11 @@ interface IPromise3<T> {
 >U : U
 >error : (error: any) => IPromise3<U>
 >error : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 
     then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): IPromise3<U>;
@@ -64,7 +64,7 @@ interface IPromise3<T> {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >U : U
 
     done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
@@ -80,11 +80,11 @@ interface IPromise3<T> {
 }
 var p1: IPromise3<string>;
 >p1 : IPromise3<string>
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 
 var p2: IPromise3<string> = p1.then(function (x) {
 >p2 : IPromise3<string>
->IPromise3 : IPromise3
+>IPromise3 : IPromise3<T>
 >p1.then(function (x) {
     return x;
 }) : IPromise3<string>
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index 9f37c62b236..bc00be77faa 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -13,17 +13,17 @@ declare module Windows.Foundation {
 >success : (value: T) => IPromise<U>
 >value : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -32,7 +32,7 @@ declare module Windows.Foundation {
 >success : (value: T) => IPromise<U>
 >value : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >error : (error: any) => U
 >error : any
@@ -41,7 +41,7 @@ declare module Windows.Foundation {
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -53,13 +53,13 @@ declare module Windows.Foundation {
 >U : U
 >error : (error: any) => IPromise<U>
 >error : any
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 >progress : (progress: any) => void
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         then<U>(success?: (value: T) => U, error?: (error: any) => U, progress?: (progress: any) => void ): Windows.Foundation.IPromise<U>;
@@ -76,7 +76,7 @@ declare module Windows.Foundation {
 >progress : any
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 
         done? <U>(success?: (value: T) => any, error?: (error: any) => any, progress?: (progress: any) => void ): void;
@@ -96,7 +96,7 @@ var p: Windows.Foundation.IPromise<number> = null;
 >p : IPromise<number>
 >Windows : Windows
 >Foundation : Foundation
->IPromise : IPromise
+>IPromise : IPromise<T>
  
 p.then(function (x) { } ); // should not error
 >p.then(function (x) { } ) : IPromise<void>
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index febff9b9dd5..de3c33bbfad 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -7,7 +7,7 @@ module Editor {
 
     	lines: List<Line> = ListMakeHead<Line>();
 >lines : List<Line>
->List : List
+>List : List<T>
 >Line : Line
 >ListMakeHead<Line>() : List<Line>
 >ListMakeHead : <U>() => List<U>
@@ -16,7 +16,7 @@ module Editor {
         addLine(lineText: string): List<Line> {
 >addLine : (lineText: string) => List<Line>
 >lineText : string
->List : List
+>List : List<T>
 >Line : Line
             
             var line: Line = new Line();
@@ -44,9 +44,9 @@ module Editor {
 >ListRemoveEntry : <U>(entry: List<U>) => List<U>
 >U : U
 >entry : List<U>
->List : List
+>List : List<T>
 >U : U
->List : List
+>List : List<T>
 >U : U
 
     	return entry;
@@ -56,7 +56,7 @@ module Editor {
     export function ListMakeHead<U>(): List<U> {
 >ListMakeHead : <U>() => List<U>
 >U : U
->List : List
+>List : List<T>
 >U : U
 
 		return null;
@@ -67,7 +67,7 @@ module Editor {
 >U : U
 >data : U
 >U : U
->List : List
+>List : List<T>
 >U : U
 
 		return null;
@@ -79,14 +79,14 @@ module Editor {
 
         public next: List<T>; 
 >next : List<T>
->List : List
+>List : List<T>
 >T : T
 
         add(data: T): List<T> {
 >add : (data: T) => List<T>
 >data : T
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             this.next = ListMakeEntry(data);
@@ -107,9 +107,9 @@ module Editor {
         popEntry(head: List<T>): List<T> {
 >popEntry : (head: List<T>) => List<T>
 >head : List<T>
->List : List
+>List : List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 
             return (ListRemoveEntry(this.next));
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index 87c546850aa..7cb45208e81 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -15,7 +15,7 @@ module App {
 
   import Key = Keyboard.Key;
 >Key : typeof Key
->Keyboard : Key
+>Keyboard : typeof Keyboard
 >Key : Key
 
   export function foo(key: Key): void {}
diff --git a/tests/baselines/reference/mergeThreeInterfaces.types b/tests/baselines/reference/mergeThreeInterfaces.types
index 5db2a931023..4f4fba64358 100644
--- a/tests/baselines/reference/mergeThreeInterfaces.types
+++ b/tests/baselines/reference/mergeThreeInterfaces.types
@@ -75,7 +75,7 @@ interface B<T> {
 
 var b: B<string>;
 >b : B<string>
->B : B
+>B : B<T>
 
 var r4 = b.foo
 >r4 : string
@@ -173,7 +173,7 @@ module M {
 
     var b: B<string>;
 >b : B<string>
->B : B
+>B : B<T>
 
     var r4 = b.foo
 >r4 : string
diff --git a/tests/baselines/reference/mergeTwoInterfaces.types b/tests/baselines/reference/mergeTwoInterfaces.types
index 4c36d37ccb7..539f01d4240 100644
--- a/tests/baselines/reference/mergeTwoInterfaces.types
+++ b/tests/baselines/reference/mergeTwoInterfaces.types
@@ -56,7 +56,7 @@ interface B<T> {
 
 var b: B<string>;
 >b : B<string>
->B : B
+>B : B<T>
 
 var r3 = b.foo
 >r3 : string
@@ -125,7 +125,7 @@ module M {
 
     var b: B<string>;
 >b : B<string>
->B : B
+>B : B<T>
 
     var r3 = b.foo
 >r3 : string
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
index 33b72a51710..4fb955dab2e 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
@@ -84,7 +84,7 @@ module M {
     interface A<T> extends C<T> {
 >A : A<T>
 >T : T
->C : C
+>C : C<T>
 >T : T
 
         y: T;
@@ -95,7 +95,7 @@ module M {
     interface A<T> extends C2<string> {
 >A : A<T>
 >T : T
->C2 : C2
+>C2 : C2<T>
 
         z: T;
 >z : T
@@ -104,7 +104,7 @@ module M {
 
     class D implements A<boolean> {
 >D : D
->A : A
+>A : A<T>
 
         a: boolean;
 >a : boolean
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
index 862e1e6fc17..b8dfec64bae 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
@@ -125,9 +125,9 @@ module M {
     interface A<T> extends C<T>, C3<T> {
 >A : A<T>
 >T : T
->C : C
+>C : C<T>
 >T : T
->C3 : C3
+>C3 : C3<T>
 >T : T
 
         y: T;
@@ -138,8 +138,8 @@ module M {
     interface A<T> extends C2<string>, C4<string> {
 >A : A<T>
 >T : T
->C2 : C2
->C4 : C4
+>C2 : C2<T>
+>C4 : C4<T>
 
         z: T;
 >z : T
@@ -148,7 +148,7 @@ module M {
 
     class D implements A<boolean> {
 >D : D
->A : A
+>A : A<T>
 
         a: boolean;
 >a : boolean
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
index 423678ad0be..f5951008932 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases3.types
@@ -41,8 +41,8 @@ class C4<T> {
 interface A<T> extends C<string>, C3<string> {
 >A : A<T>
 >T : T
->C : C
->C3 : C3
+>C : C<T>
+>C3 : C3<T>
 
     y: T;
 >y : T
@@ -52,8 +52,8 @@ interface A<T> extends C<string>, C3<string> {
 interface A<T> extends C<string>, C4<string> {
 >A : A<T>
 >T : T
->C : C
->C4 : C4
+>C : C<T>
+>C4 : C4<T>
 
     z: T;
 >z : T
@@ -62,7 +62,7 @@ interface A<T> extends C<string>, C4<string> {
 
 class D implements A<boolean> {
 >D : D
->A : A
+>A : A<T>
 
     a: string;
 >a : string
diff --git a/tests/baselines/reference/mismatchedGenericArguments1.types b/tests/baselines/reference/mismatchedGenericArguments1.types
index 41982d1de1b..4d4d216bef1 100644
--- a/tests/baselines/reference/mismatchedGenericArguments1.types
+++ b/tests/baselines/reference/mismatchedGenericArguments1.types
@@ -13,7 +13,7 @@ interface IFoo<T> {
 class C<T> implements IFoo<T> {
 >C : C<T>
 >T : T
->IFoo : IFoo
+>IFoo : IFoo<T>
 >T : T
 
    foo(x: string): number {
@@ -27,7 +27,7 @@ class C<T> implements IFoo<T> {
 class C2<T> implements IFoo<T> {
 >C2 : C2<T>
 >T : T
->IFoo : IFoo
+>IFoo : IFoo<T>
 >T : T
 
    foo<U>(x: string): number {
diff --git a/tests/baselines/reference/missingTypeArguments3.types b/tests/baselines/reference/missingTypeArguments3.types
index 6c4bc9b3ccf..b62125f179d 100644
--- a/tests/baselines/reference/missingTypeArguments3.types
+++ b/tests/baselines/reference/missingTypeArguments3.types
@@ -9,7 +9,7 @@ declare module linq {
         OrderByDescending(keySelector?: string): OrderedEnumerable<T>;
 >OrderByDescending : (keySelector?: string) => OrderedEnumerable<T>
 >keySelector : string
->OrderedEnumerable : OrderedEnumerable
+>OrderedEnumerable : OrderedEnumerable<T>
 >T : T
 
         GroupBy<TKey>(keySelector: (element: T) => TKey): Enumerable<Grouping<TKey, T>>;
@@ -19,8 +19,8 @@ declare module linq {
 >element : T
 >T : T
 >TKey : TKey
->Enumerable : Enumerable
->Grouping : Grouping
+>Enumerable : Enumerable<T>
+>Grouping : Grouping<TKey, TElement>
 >TKey : TKey
 >T : T
 
@@ -36,8 +36,8 @@ declare module linq {
 >element : T
 >T : T
 >TElement : TElement
->Enumerable : Enumerable
->Grouping : Grouping
+>Enumerable : Enumerable<T>
+>Grouping : Grouping<TKey, TElement>
 >TKey : TKey
 >TElement : TElement
 
@@ -48,7 +48,7 @@ declare module linq {
 >element : T
 >T : T
 >TKey : TKey
->Dictionary : Dictionary
+>Dictionary : Dictionary<TKey, TValue>
 >TKey : TKey
 >T : T
     }
@@ -56,7 +56,7 @@ declare module linq {
     interface OrderedEnumerable<T> extends Enumerable<T> {
 >OrderedEnumerable : OrderedEnumerable<T>
 >T : T
->Enumerable : Enumerable
+>Enumerable : Enumerable<T>
 >T : T
 
         ThenBy<TCompare>(keySelector: (element: T) => TCompare): OrderedEnumerable<T>; // used to incorrectly think this was missing a type argument
@@ -66,7 +66,7 @@ declare module linq {
 >element : T
 >T : T
 >TCompare : TCompare
->OrderedEnumerable : OrderedEnumerable
+>OrderedEnumerable : OrderedEnumerable<T>
 >T : T
     }
 
@@ -74,7 +74,7 @@ declare module linq {
 >Grouping : Grouping<TKey, TElement>
 >TKey : TKey
 >TElement : TElement
->Enumerable : Enumerable
+>Enumerable : Enumerable<T>
 >TElement : TElement
 
         Key(): TKey;
@@ -93,7 +93,7 @@ declare module linq {
         Get(key): Enumerable<any>;
 >Get : (key: any) => Enumerable<any>
 >key : any
->Enumerable : Enumerable
+>Enumerable : Enumerable<T>
 
         Contains(key): boolean;
 >Contains : (key: any) => boolean
@@ -101,8 +101,8 @@ declare module linq {
 
         ToEnumerable(): Enumerable<Grouping<TKey, any>>;
 >ToEnumerable : () => Enumerable<Grouping<TKey, any>>
->Enumerable : Enumerable
->Grouping : Grouping
+>Enumerable : Enumerable<T>
+>Grouping : Grouping<TKey, TElement>
 >TKey : TKey
     }
 
@@ -149,8 +149,8 @@ declare module linq {
 
         ToEnumerable(): Enumerable<KeyValuePair<TKey, TValue>>;
 >ToEnumerable : () => Enumerable<KeyValuePair<TKey, TValue>>
->Enumerable : Enumerable
->KeyValuePair : KeyValuePair
+>Enumerable : Enumerable<T>
+>KeyValuePair : KeyValuePair<TKey, TValue>
 >TKey : TKey
 >TValue : TValue
     }
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.types b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
index 59fe842a5d6..f2a8b24e6b3 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName3.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
@@ -21,5 +21,5 @@ var z: X.Y.Z = null;
 var z2: X.Y<string>;
 >z2 : Y<string>
 >X : X
->Y : Y
+>Y : Y<T>
 
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
index 264d862675a..73097ef86ce 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
@@ -9,7 +9,7 @@ class C1<T>{ }
 
 class Test1 extends C1<M2.M2C> {
 >Test1 : Test1
->C1 : C1
+>C1 : C1<T>
 >M2 : M2
 >M2C : M2C
 }
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index bb20aac9e46..0f266892351 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -18,7 +18,7 @@ module OuterMod {
 
 import OuterInnerAlias = OuterMod.OuterInnerMod;
 >OuterInnerAlias : typeof OuterInnerMod
->OuterMod : typeof OuterInnerMod
+>OuterMod : typeof OuterMod
 >OuterInnerMod : typeof OuterInnerMod
 
 module M {
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index af596503e5c..1855f6eb587 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -18,7 +18,7 @@ module A {
 
     class B extends AA<string> implements I { id: number }
 >B : B
->AA : AA
+>AA : AA<T>
 >I : I
 >id : number
 
@@ -94,7 +94,7 @@ module Y {
 
     export class B extends AA<string> implements I { id: number }
 >B : B
->AA : AA
+>AA : AA<T>
 >I : I
 >id : number
 
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
index 24fc40448f2..989f7d32d29 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes1.types
@@ -5,7 +5,7 @@ interface A<T> {
 
     foo(): B<T>; // instead of B does see this
 >foo : { (): B<T>; (): void; }
->B : B
+>B : B<T>
 >T : T
 
     foo(): void; // instead of B does see this
@@ -13,13 +13,13 @@ interface A<T> {
  
     foo2(): B<number>;
 >foo2 : () => B<number>
->B : B
+>B : B<T>
 }
  
 interface B<T> extends A<T> {
 >B : B<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
 
     bar(): void;
@@ -28,7 +28,7 @@ interface B<T> extends A<T> {
  
 var b: B<number>;
 >b : B<number>
->B : B
+>B : B<T>
 
 b.foo(); // should not error
 >b.foo() : B<number>
diff --git a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
index a619c91f6ab..5cadfa780fe 100644
--- a/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
+++ b/tests/baselines/reference/mutuallyRecursiveGenericBaseTypes2.types
@@ -5,14 +5,14 @@ class foo<T>
 {
     bar(): foo2<T[]> { return null; }
 >bar : () => foo2<T[]>
->foo2 : foo2
+>foo2 : foo2<T>
 >T : T
 }
  
 class foo2<T> extends foo<T> {
 >foo2 : foo2<T>
 >T : T
->foo : foo
+>foo : foo<T>
 >T : T
 }
  
diff --git a/tests/baselines/reference/nestedGenerics.types b/tests/baselines/reference/nestedGenerics.types
index a7c58fc3c19..24d7fea3baa 100644
--- a/tests/baselines/reference/nestedGenerics.types
+++ b/tests/baselines/reference/nestedGenerics.types
@@ -10,6 +10,6 @@ interface Foo<T> {
 
 var f: Foo<Foo<number>>;
 >f : Foo<Foo<number>>
->Foo : Foo
->Foo : Foo
+>Foo : Foo<T>
+>Foo : Foo<T>
 
diff --git a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
index 5eab4d1eedb..4a252d29961 100644
--- a/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
+++ b/tests/baselines/reference/nestedInfinitelyExpandedRecursiveTypes.types
@@ -5,8 +5,8 @@ interface F<T> {
 
       t: G<F<() => T>>;
 >t : G<F<() => T>>
->G : G
->F : F
+>G : G<U>
+>F : F<T>
 >T : T
 }
 interface G<U> {
@@ -15,18 +15,18 @@ interface G<U> {
 
       t: G<G<() => U>>;
 >t : G<G<() => U>>
->G : G
->G : G
+>G : G<U>
+>G : G<U>
 >U : U
 }
  
 var f: F<string>;
 >f : F<string>
->F : F
+>F : F<T>
 
 var g: G<string>;
 >g : G<string>
->G : G
+>G : G<U>
 
 f = g;
 >f = g : G<string>
diff --git a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
index 88e6f5c4572..8629c3cce0a 100644
--- a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -12,7 +12,7 @@ interface I<T> {
 }
 var i: I<string>;
 >i : I<string>
->I : I
+>I : I<T>
 
 var y = new i(""); // y should be string
 >y : string
diff --git a/tests/baselines/reference/newOperatorConformance.types b/tests/baselines/reference/newOperatorConformance.types
index f6cd80b1694..37205bd6177 100644
--- a/tests/baselines/reference/newOperatorConformance.types
+++ b/tests/baselines/reference/newOperatorConformance.types
@@ -64,7 +64,7 @@ var c1 = new T;
 
 var c1: T<{}>;
 >c1 : T<{}>
->T : T
+>T : T<T>
 
 // Construct expression where constructor is of type 'any' with no parentheses
 var d = new anyCtor;
diff --git a/tests/baselines/reference/noConstraintInReturnType1.types b/tests/baselines/reference/noConstraintInReturnType1.types
index af290ccfabf..19a7529ac79 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.types
+++ b/tests/baselines/reference/noConstraintInReturnType1.types
@@ -6,7 +6,7 @@ class List<T extends {}> {
     static empty<T extends {}>(): List<T> { return null; }
 >empty : <T extends {}>() => List<T>
 >T : T
->List : List
+>List : List<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
index e0779ce91aa..79b2ac77d78 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter.types
@@ -28,10 +28,10 @@ interface Sequence<T> {
 >zip : <S>(seq: Sequence<S>) => Sequence<Tuple<T, S>>
 >S : S
 >seq : Sequence<S>
->Sequence : Sequence
+>Sequence : Sequence<T>
 >S : S
->Sequence : Sequence
->Tuple : Tuple
+>Sequence : Sequence<T>
+>Tuple : Tuple<T, S>
 >T : T
 >S : S
 }
@@ -41,7 +41,7 @@ interface Sequence<T> {
 interface List<T> extends Sequence<T> {
 >List : List<T>
 >T : T
->Sequence : Sequence
+>Sequence : Sequence<T>
 >T : T
 
     getLength(): number
@@ -51,10 +51,10 @@ interface List<T> extends Sequence<T> {
 >zip : <S>(seq: Sequence<S>) => List<Tuple<T, S>>
 >S : S
 >seq : Sequence<S>
->Sequence : Sequence
+>Sequence : Sequence<T>
 >S : S
->List : List
->Tuple : Tuple
+>List : List<T>
+>Tuple : Tuple<T, S>
 >T : T
 >S : S
 }
diff --git a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
index 213bf673e66..31549cd59c9 100644
--- a/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
+++ b/tests/baselines/reference/nominalSubtypeCheckOfTypeParameter2.types
@@ -12,7 +12,7 @@ interface B<T> {
 interface A<T> extends B<T> {
 >A : A<T>
 >T : T
->B : B
+>B : B<T>
 >T : T
 
     foo: T;
@@ -24,8 +24,8 @@ interface A<T> extends B<T> {
 interface A2<T> extends B<B<string>> {
 >A2 : A2<T>
 >T : T
->B : B
->B : B
+>B : B<T>
+>B : B<T>
 
     baz: T;
 >baz : T
@@ -45,8 +45,8 @@ interface C<T> {
 interface A3<T> extends B<C<T>> {
 >A3 : A3<T>
 >T : T
->B : B
->C : C
+>B : B<T>
+>C : C<T>
 >T : T
 
     bing: T;
diff --git a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
index dd73f02036b..aa01b508764 100644
--- a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
+++ b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.types
@@ -5,7 +5,7 @@ interface A<T> {
 
     x: C<T>
 >x : C<T>
->C : C
+>C : C<T>
 >T : T
 }
 
@@ -15,15 +15,15 @@ interface B<T> {
 
     x: C<T>
 >x : C<T>
->C : C
+>C : C<T>
 >T : T
 }
 
 interface C<T> extends A<T>, B<T> { } // Should not be an error
 >C : C<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
->B : B
+>B : B<T>
 >T : T
 
diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
index 12c1418ad2a..177becac643 100644
--- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
+++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.types
@@ -10,5 +10,5 @@ class Foo<T> {
 
 class Bar extends Foo<any> { } // Valid
 >Bar : Bar
->Foo : Foo
+>Foo : Foo<T>
 
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index ed47a8a4ba6..0395ae8faf5 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -153,7 +153,7 @@ class C2<T> { foo: T; }
 
 var c2: C2<number>;
 >c2 : C2<number>
->C2 : C2
+>C2 : C2<T>
 
 var r12 = true ? c2 : null;
 >r12 : C2<number>
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.types b/tests/baselines/reference/objectLiteralArraySpecialization.types
index bb1a8f16f29..d077354728b 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.types
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.types
@@ -4,7 +4,7 @@ declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
 >T : T
 >initialValues : T[]
 >T : T
->MyArrayWrapper : MyArrayWrapper
+>MyArrayWrapper : MyArrayWrapper<T>
 >T : T
 
 interface MyArrayWrapper<T> {
diff --git a/tests/baselines/reference/objectTypesIdentity.types b/tests/baselines/reference/objectTypesIdentity.types
index 03e0c6ff0b3..c148c4223ed 100644
--- a/tests/baselines/reference/objectTypesIdentity.types
+++ b/tests/baselines/reference/objectTypesIdentity.types
@@ -71,12 +71,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -146,7 +146,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -202,7 +202,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -244,7 +244,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentity2.types b/tests/baselines/reference/objectTypesIdentity2.types
index 13a19f0c268..1969d55bd11 100644
--- a/tests/baselines/reference/objectTypesIdentity2.types
+++ b/tests/baselines/reference/objectTypesIdentity2.types
@@ -71,7 +71,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -127,7 +127,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -169,7 +169,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
index 36354b4e064..f73785fab0d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
@@ -90,12 +90,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -165,7 +165,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -221,7 +221,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -263,7 +263,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -272,12 +272,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // error
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -314,12 +314,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
index b8ff76d8d6b..16b658d0e43 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
@@ -92,12 +92,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -167,7 +167,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -223,7 +223,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -265,7 +265,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -274,12 +274,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // error
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -316,12 +316,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
index 781bb66a44f..0ebbc639e5f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
@@ -94,12 +94,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -169,7 +169,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -225,7 +225,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -267,7 +267,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -276,12 +276,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -318,12 +318,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
index 4d2b02481ee..b72d0a799e4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
@@ -54,12 +54,12 @@ function foo3(x: any) { }
 function foo4(x: I2<string>);
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo4(x: I2<string>); // error
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo4(x: any) { }
 >foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
@@ -68,12 +68,12 @@ function foo4(x: any) { }
 function foo5(x: I2<string>);
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo5(x: I2<number>); // ok
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<number>
->I2 : I2
+>I2 : I2<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
@@ -101,7 +101,7 @@ function foo14(x: I);
 function foo14(x: I2<string>); // error
 >foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo14(x: any) { }
 >foo14 : { (x: I): any; (x: I2<string>): any; }
@@ -115,7 +115,7 @@ function foo14b(x: typeof a);
 function foo14b(x: I2<string>); // ok
 >foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo14b(x: any) { }
 >foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
@@ -129,7 +129,7 @@ function foo15(x: I);
 function foo15(x: I2<number>); // ok
 >foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I2<number>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I): any; (x: I2<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
index a57aa38b5fe..efca8fc72dd 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
@@ -144,12 +144,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -219,7 +219,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -275,7 +275,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -317,7 +317,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -326,12 +326,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -368,12 +368,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
index 45e89698d41..a29f213bdde 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
@@ -76,12 +76,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -137,7 +137,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -193,7 +193,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -221,7 +221,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -230,12 +230,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -258,12 +258,12 @@ function foo13(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
index cd94be2f367..c530f1ced9b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
@@ -64,12 +64,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -139,7 +139,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error, types are structurally equal
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -181,7 +181,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -190,12 +190,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -232,12 +232,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
index 763e154bb57..e5598f874e0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
@@ -66,12 +66,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -141,7 +141,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error, types are structurally equal
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -183,7 +183,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
@@ -192,12 +192,12 @@ function foo12(x: any) { }
 function foo12b(x: I2<string>);
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2<string>): any; (x: C<string>): any; }
@@ -234,12 +234,12 @@ function foo14(x: any) { }
 function foo15(x: I2<string>);
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
->I2 : I2
+>I2 : I2<T>
 
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2<string>): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
index da3e99870d0..240e12b1c22 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
@@ -91,12 +91,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -105,12 +105,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -119,12 +119,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -166,7 +166,7 @@ function foo5(x: A);
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -180,7 +180,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -194,7 +194,7 @@ function foo6(x: A);
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -217,12 +217,12 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -231,12 +231,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -245,7 +245,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -259,7 +259,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
@@ -273,12 +273,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -292,7 +292,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -301,7 +301,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -315,7 +315,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
@@ -334,7 +334,7 @@ function foo15(x: I2);
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
index cdbec140acd..932dbf7e9b3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
@@ -112,12 +112,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -126,12 +126,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -140,12 +140,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -187,7 +187,7 @@ function foo5(x: A);
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -201,7 +201,7 @@ function foo5b(x: A);
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -215,7 +215,7 @@ function foo6(x: A);
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -238,12 +238,12 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo8(x: I<string, number>); // error
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -252,12 +252,12 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -266,7 +266,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -280,7 +280,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
@@ -294,12 +294,12 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -313,7 +313,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -322,7 +322,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
@@ -336,7 +336,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
@@ -355,7 +355,7 @@ function foo15(x: I2);
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index 30533d64909..2a5ab2dfe70 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -17,7 +17,7 @@ class A {
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : Array
+>Array : T[]
 
     foo(x: T): string { return null; }
 >foo : (x: T) => string
@@ -62,7 +62,7 @@ var a: { foo<T extends Array<string>>(x: T): string }
 >a : { foo<T extends string[]>(x: T): string; }
 >foo : <T extends string[]>(x: T) => string
 >T : T
->Array : Array
+>Array : T[]
 >x : T
 >T : T
 
@@ -93,14 +93,14 @@ function foo1(x: any) { }
 function foo1b(x: B<Array<number>>);
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
@@ -109,13 +109,13 @@ function foo1b(x: any) { }
 function foo1c(x: C<String>);
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo1c(x: any) { }
@@ -125,13 +125,13 @@ function foo1c(x: any) { }
 function foo2(x: I<Number>);
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
@@ -174,8 +174,8 @@ function foo5(x: A);
 function foo5(x: B<Array<number>>); // ok
 >foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<number[]>): any; }
@@ -189,7 +189,7 @@ function foo5b(x: A);
 function foo5b(x: C<String>); // ok
 >foo5b : { (x: A): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo5b(x: any) { }
@@ -204,7 +204,7 @@ function foo6(x: A);
 function foo6(x: I<Number>); // ok
 >foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo6(x: any) { }
@@ -228,13 +228,13 @@ function foo7(x: any) { }
 function foo8(x: B<Array<number>>);
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
@@ -244,13 +244,13 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>>);
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo9(x: C<String>); // ok
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo9(x: any) { }
@@ -260,8 +260,8 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>>);
 >foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
@@ -275,8 +275,8 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>>);
 >foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
@@ -290,13 +290,13 @@ function foo11(x: any) { }
 function foo12(x: I<Number>);
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo12(x: any) { }
@@ -311,7 +311,7 @@ function foo12b(x: I2);
 function foo12b(x: C<String>); // ok
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo12b(x: any) { }
@@ -321,7 +321,7 @@ function foo12b(x: any) { }
 function foo13(x: I<Number>);
 >foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo13(x: typeof a); // ok
@@ -336,7 +336,7 @@ function foo13(x: any) { }
 function foo14(x: I<Number>);
 >foo14 : { (x: I<Number>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo14(x: typeof b); // ok
@@ -356,7 +356,7 @@ function foo15(x: I2);
 function foo15(x: C<String>); // ok
 >foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo15(x: any) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
index 5da4a078018..9de1a816ab7 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
@@ -89,12 +89,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -103,12 +103,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -117,12 +117,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -164,7 +164,7 @@ function foo5(x: A);
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -178,7 +178,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -192,7 +192,7 @@ function foo6(x: A);
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -215,12 +215,12 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo8(x: I<string>); // ok
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -229,12 +229,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -243,7 +243,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -257,7 +257,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
@@ -271,12 +271,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -290,7 +290,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -299,7 +299,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
@@ -313,7 +313,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
@@ -332,7 +332,7 @@ function foo15(x: I2);
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
index eb3160f5083..f6f33890c07 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
@@ -96,13 +96,13 @@ function foo1(x: any) { }
 function foo1b(x: B<Date>);
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
@@ -112,13 +112,13 @@ function foo1b(x: any) { }
 function foo1c(x: C<Date>);
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
@@ -128,13 +128,13 @@ function foo1c(x: any) { }
 function foo2(x: I<Date>);
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
@@ -177,7 +177,7 @@ function foo5(x: A);
 function foo5(x: B<Date>); // ok
 >foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo5(x: any) { }
@@ -192,7 +192,7 @@ function foo5b(x: A);
 function foo5b(x: C<Date>); // ok
 >foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo5b(x: any) { }
@@ -207,7 +207,7 @@ function foo6(x: A);
 function foo6(x: I<Date>); // ok
 >foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo6(x: any) { }
@@ -231,13 +231,13 @@ function foo7(x: any) { }
 function foo8(x: B<Date>);
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
@@ -247,13 +247,13 @@ function foo8(x: any) { }
 function foo9(x: B<Date>);
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo9(x: C<Date>); // ok
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
@@ -263,7 +263,7 @@ function foo9(x: any) { }
 function foo10(x: B<Date>);
 >foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo10(x: typeof a); // ok
@@ -278,7 +278,7 @@ function foo10(x: any) { }
 function foo11(x: B<Date>);
 >foo11 : { (x: B<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo11(x: typeof b); // ok
@@ -293,13 +293,13 @@ function foo11(x: any) { }
 function foo12(x: I<Date>);
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
@@ -314,7 +314,7 @@ function foo12b(x: I2);
 function foo12b(x: C<Date>); // ok
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
@@ -324,7 +324,7 @@ function foo12b(x: any) { }
 function foo13(x: I<Date>);
 >foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo13(x: typeof a); // ok
@@ -339,7 +339,7 @@ function foo13(x: any) { }
 function foo14(x: I<Date>);
 >foo14 : { (x: I<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo14(x: typeof b); // ok
@@ -359,7 +359,7 @@ function foo15(x: I2);
 function foo15(x: C<Date>); // ok
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
index 025abacda6f..dbd6d3e7d03 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
@@ -109,12 +109,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string, string>);
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo1b(x: B<string, string>); // error
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
@@ -123,12 +123,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number, boolean>);
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo1c(x: C<string, number, boolean>); // error
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
@@ -137,12 +137,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, boolean, number, string>);
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo2(x: I<string, boolean, number, string>); // error
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -184,7 +184,7 @@ function foo5(x: A);
 function foo5(x: B<string, string>); // ok
 >foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, string>): any; }
@@ -198,7 +198,7 @@ function foo5b(x: A);
 function foo5b(x: C<string, number, boolean>); // ok
 >foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
@@ -212,7 +212,7 @@ function foo6(x: A);
 function foo6(x: I<string, number, boolean, Date>); // ok
 >foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
 >x : I<string, number, boolean, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo6(x: any) { }
@@ -236,12 +236,12 @@ function foo7(x: any) { }
 function foo8(x: B<string, string>);
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo8(x: I<string, string, boolean, Date>); // error
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : I<string, string, boolean, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo8(x: any) { }
@@ -251,13 +251,13 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : B<string, number>
->B : B
+>B : B<U, V>
 
 function foo9(x: C<string, number, B<string, string>>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : C<string, number, B<string, string>>
->C : C
->B : B
+>C : C<V, W, X>
+>B : B<U, V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
@@ -266,7 +266,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, boolean>);
 >foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : B<string, boolean>
->B : B
+>B : B<U, V>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
@@ -280,7 +280,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, boolean>);
 >foo11 : { (x: B<string, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : B<string, boolean>
->B : B
+>B : B<U, V>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
@@ -294,15 +294,15 @@ function foo11(x: any) { }
 function foo12(x: I<B<string, number>, number, Date, string>);
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : I<B<string, number>, number, Date, string>
->I : I
->B : B
+>I : I<X, Y, Z, A>
+>B : B<U, V>
 >Date : Date
 
 function foo12(x: C<B<string, number>, number, Date>); // error
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : C<B<string, number>, number, Date>
->C : C
->B : B
+>C : C<V, W, X>
+>B : B<U, V>
 >Date : Date
 
 function foo12(x: any) { }
@@ -317,7 +317,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, string, boolean>); // ok
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : C<string, string, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
@@ -326,7 +326,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, Date, RegExp, Date>);
 >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>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 >RegExp : RegExp
 >Date : Date
@@ -343,7 +343,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, Date, RegExp, boolean>);
 >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>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 >RegExp : RegExp
 
@@ -364,9 +364,9 @@ function foo15(x: I2);
 function foo15(x: C<number, B<string, string>, B<number, string>>); // ok
 >foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
 >x : C<number, B<string, string>, B<number, string>>
->C : C
->B : B
->B : B
+>C : C<V, W, X>
+>B : B<U, V>
+>B : B<U, V>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
index 713af12dfff..8cc0042cc9e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
@@ -42,12 +42,12 @@ var a: { <Z, A, B, C, D>(x: Z): Z }
 function foo1(x: I<string, boolean, number, string>);
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo1(x: I<string, boolean, number, string>); // error
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo1(x: any) { }
 >foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -84,7 +84,7 @@ function foo3(x: any) { }
 function foo13(x: I<boolean, string, number, Date>);
 >foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : I<boolean, string, number, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo13(x: typeof a); // ok
@@ -99,7 +99,7 @@ function foo13(x: any) { }
 function foo14(x: I<boolean, string, number, Date>);
 >foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I<boolean, string, number, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo14(x: I2); // error
@@ -128,7 +128,7 @@ function foo14b(x: any) { }
 function foo15(x: I<boolean, string, number, Date>);
 >foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I<boolean, string, number, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo15(x: I2); // ok
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
index 6888b9f08e3..85e83528cd0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
@@ -91,12 +91,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -105,12 +105,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -119,12 +119,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -166,7 +166,7 @@ function foo5(x: A);
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -180,7 +180,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -194,7 +194,7 @@ function foo6(x: A);
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -217,12 +217,12 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -231,12 +231,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -245,7 +245,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
@@ -259,7 +259,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
@@ -273,12 +273,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -292,7 +292,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -301,7 +301,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
@@ -315,7 +315,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
@@ -334,7 +334,7 @@ function foo15(x: I2);
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<V>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
index 1caabc6216b..bef916fc410 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
@@ -107,12 +107,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -121,12 +121,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -135,12 +135,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -182,7 +182,7 @@ function foo5(x: A);
 function foo5(x: B<string>); // ok
 >foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string>): any; }
@@ -196,7 +196,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // ok
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -210,7 +210,7 @@ function foo6(x: A);
 function foo6(x: I<string>); // ok
 >foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string>): any; }
@@ -233,12 +233,12 @@ function foo7(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo8(x: I<string>); // error
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -247,12 +247,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -261,7 +261,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -275,7 +275,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
@@ -289,12 +289,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -308,7 +308,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -317,7 +317,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
@@ -331,7 +331,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
@@ -350,7 +350,7 @@ function foo15(x: I2);
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
index 4df74d1bd13..c8a4ad6be29 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
@@ -114,12 +114,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -128,12 +128,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -142,12 +142,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -189,7 +189,7 @@ function foo5(x: A);
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -203,7 +203,7 @@ function foo5b(x: A);
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -217,7 +217,7 @@ function foo6(x: A);
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -240,12 +240,12 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo8(x: I<string, number>); // error
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -254,12 +254,12 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -268,7 +268,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -282,7 +282,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
@@ -296,12 +296,12 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -315,7 +315,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -324,7 +324,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -338,7 +338,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
@@ -357,7 +357,7 @@ function foo15(x: I2);
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
index dd6a97b32ed..06c23dcd0b1 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
@@ -114,12 +114,12 @@ function foo1(x: any) { }
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -128,12 +128,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -142,12 +142,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -189,7 +189,7 @@ function foo5(x: A);
 function foo5(x: B<string, number>); // ok
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo5(x: any) { }
 >foo5 : { (x: A): any; (x: B<string, number>): any; }
@@ -203,7 +203,7 @@ function foo5b(x: A);
 function foo5b(x: C<string, number>); // ok
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string, number>): any; }
@@ -217,7 +217,7 @@ function foo6(x: A);
 function foo6(x: I<string, number>); // ok
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo6(x: any) { }
 >foo6 : { (x: A): any; (x: I<string, number>): any; }
@@ -240,12 +240,12 @@ function foo7(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo8(x: I<string, number>); // ok
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -254,12 +254,12 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo9(x: C<string, number>); // ok
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -268,7 +268,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -282,7 +282,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
@@ -296,12 +296,12 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo12(x: C<string, number>); // error
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -315,7 +315,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -324,7 +324,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
@@ -338,7 +338,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
@@ -357,7 +357,7 @@ function foo15(x: I2);
 function foo15(x: C<string, number>); // ok
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<string, number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index bafb2a09e09..8a41814e1a9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -6,7 +6,7 @@
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : Array
+>Array : T[]
 
     constructor(x: T) { return null; }
 >x : T
@@ -46,7 +46,7 @@ interface I2 {
 var a: { new<T extends Array<string>>(x: T): string }
 >a : new <T extends string[]>(x: T) => string
 >T : T
->Array : Array
+>Array : T[]
 >x : T
 >T : T
 
@@ -63,14 +63,14 @@ var b = { new<T extends RegExp>(x: T) { return ''; } }; // not a construct signa
 function foo1b(x: B<Array<number>>);
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
@@ -79,13 +79,13 @@ function foo1b(x: any) { }
 function foo1c(x: C<String>);
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
 >foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo1c(x: any) { }
@@ -95,13 +95,13 @@ function foo1c(x: any) { }
 function foo2(x: I<Number>);
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
 >foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
@@ -139,13 +139,13 @@ function foo4(x: any) { }
 function foo8(x: B<Array<number>>);
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
@@ -155,13 +155,13 @@ function foo8(x: any) { }
 function foo9(x: B<Array<number>>);
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo9(x: C<String>); // error, types are structurally equal
 >foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo9(x: any) { }
@@ -171,8 +171,8 @@ function foo9(x: any) { }
 function foo10(x: B<Array<number>>);
 >foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
@@ -186,8 +186,8 @@ function foo10(x: any) { }
 function foo11(x: B<Array<number>>);
 >foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : B<number[]>
->B : B
->Array : Array
+>B : B<T>
+>Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
@@ -201,13 +201,13 @@ function foo11(x: any) { }
 function foo12(x: I<Number>);
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
 >foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo12(x: any) { }
@@ -222,7 +222,7 @@ function foo12b(x: I2);
 function foo12b(x: C<String>); // ok
 >foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
->C : C
+>C : C<T>
 >String : String
 
 function foo12b(x: any) { }
@@ -232,7 +232,7 @@ function foo12b(x: any) { }
 function foo13(x: I<Number>);
 >foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo13(x: typeof a); // ok
@@ -247,7 +247,7 @@ function foo13(x: any) { }
 function foo14(x: I<Number>);
 >foo14 : { (x: I<Number>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : I<Number>
->I : I
+>I : I<T>
 >Number : Number
 
 function foo14(x: typeof b); // ok
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
index cbbad7716dc..1eac69f7f23 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
@@ -61,12 +61,12 @@ var b = { new<T>(x: T): T { return null; } }; // not a construct signature, func
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -75,12 +75,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -89,12 +89,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -145,12 +145,12 @@ function foo5(x: any): any { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo8(x: I<string>); // ok
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -159,12 +159,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo9(x: C<string>); // error since types are structurally equal
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -173,7 +173,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
@@ -187,7 +187,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
@@ -201,12 +201,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -220,7 +220,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // ok
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -229,7 +229,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo13(x: typeof a); // ok
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
@@ -243,7 +243,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
@@ -262,7 +262,7 @@ function foo15(x: I2);
 function foo15(x: C<number>); // ok
 >foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo15(x: any) { }
 >foo15 : { (x: I2): any; (x: C<number>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
index 94e8657a63a..308f592ef12 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
@@ -66,13 +66,13 @@ var b = { new<T extends Date>(x: T) { return null; } }; // not a construct signa
 function foo1b(x: B<Date>);
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
 >foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
@@ -82,13 +82,13 @@ function foo1b(x: any) { }
 function foo1c(x: C<Date>);
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
 >foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
@@ -98,13 +98,13 @@ function foo1c(x: any) { }
 function foo2(x: I<Date>);
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
 >foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
@@ -142,13 +142,13 @@ function foo4(x: any) { }
 function foo8(x: B<Date>);
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
 >foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
@@ -158,13 +158,13 @@ function foo8(x: any) { }
 function foo9(x: B<Date>);
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo9(x: C<Date>); // error since types are structurally equal
 >foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
@@ -174,7 +174,7 @@ function foo9(x: any) { }
 function foo10(x: B<Date>);
 >foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo10(x: typeof a); // ok
@@ -189,7 +189,7 @@ function foo10(x: any) { }
 function foo11(x: B<Date>);
 >foo11 : { (x: B<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : B<Date>
->B : B
+>B : B<T>
 >Date : Date
 
 function foo11(x: typeof b); // ok
@@ -204,13 +204,13 @@ function foo11(x: any) { }
 function foo12(x: I<Date>);
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
 >foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
@@ -225,7 +225,7 @@ function foo12b(x: I2);
 function foo12b(x: C<Date>); // ok
 >foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
@@ -235,7 +235,7 @@ function foo12b(x: any) { }
 function foo13(x: I<Date>);
 >foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo13(x: typeof a); // ok
@@ -250,7 +250,7 @@ function foo13(x: any) { }
 function foo14(x: I<Date>);
 >foo14 : { (x: I<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 function foo14(x: typeof b); // ok
@@ -270,7 +270,7 @@ function foo15(x: I2);
 function foo15(x: C<Date>); // ok
 >foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
->C : C
+>C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
index b4259c24a52..0276458ea91 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
@@ -32,7 +32,7 @@ interface I<X, Y, Z, A> {
     new(x: X): B<X,Y>;
 >x : X
 >X : X
->B : B
+>B : B<U, V>
 >X : X
 >Y : Y
 }
@@ -47,7 +47,7 @@ interface I2 {
 >B : B
 >x : Y
 >Y : Y
->C : C
+>C : C<V, W, X>
 >Y : Y
 >Z : Z
 >A : A
@@ -62,7 +62,7 @@ var a: { new <Z, A, B, CC, D>(x: Z): C<Z, A, B>; }
 >D : D
 >x : Z
 >Z : Z
->C : C
+>C : C<V, W, X>
 >Z : Z
 >A : A
 >B : B
@@ -85,12 +85,12 @@ var b = { new<A, B, C, D, E, F>(x: A) { return x; } };
 function foo1b(x: B<string, string>);
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo1b(x: B<string, string>); // error
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
@@ -99,12 +99,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number, boolean>);
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo1c(x: C<string, number, boolean>); // error
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : C<string, number, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
@@ -113,12 +113,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, boolean, number, string>);
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo2(x: I<string, boolean, number, string>); // error
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : I<string, boolean, number, string>
->I : I
+>I : I<X, Y, Z, A>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
@@ -155,12 +155,12 @@ function foo4(x: any) { }
 function foo8(x: B<string, string>);
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : B<string, string>
->B : B
+>B : B<U, V>
 
 function foo8(x: I<string, string, boolean, Date>); // BUG 832086
 >foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : I<string, string, boolean, Date>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 
 function foo8(x: any) { }
@@ -170,13 +170,13 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : B<string, number>
->B : B
+>B : B<U, V>
 
 function foo9(x: C<string, number, B<string, string>>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : C<string, number, B<string, string>>
->C : C
->B : B
+>C : C<V, W, X>
+>B : B<U, V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
@@ -185,7 +185,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, boolean>);
 >foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : B<string, boolean>
->B : B
+>B : B<U, V>
 
 function foo10(x: typeof a); // ok
 >foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
@@ -199,7 +199,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, boolean>);
 >foo11 : { (x: B<string, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : B<string, boolean>
->B : B
+>B : B<U, V>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
@@ -213,15 +213,15 @@ function foo11(x: any) { }
 function foo12(x: I<B<string, number>, number, Date, string>);
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : I<B<string, number>, number, Date, string>
->I : I
->B : B
+>I : I<X, Y, Z, A>
+>B : B<U, V>
 >Date : Date
 
 function foo12(x: C<B<string, number>, number, Date>); // ok
 >foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : C<B<string, number>, number, Date>
->C : C
->B : B
+>C : C<V, W, X>
+>B : B<U, V>
 >Date : Date
 
 function foo12(x: any) { }
@@ -236,7 +236,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, string, boolean>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : C<string, string, boolean>
->C : C
+>C : C<V, W, X>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
@@ -245,7 +245,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, Date, RegExp, Date>);
 >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>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 >RegExp : RegExp
 >Date : Date
@@ -262,7 +262,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, Date, RegExp, boolean>);
 >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>
->I : I
+>I : I<X, Y, Z, A>
 >Date : Date
 >RegExp : RegExp
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
index 39b6f8e3a9f..10a8da26907 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
@@ -26,7 +26,7 @@ interface I<X> {
     new(x: X): B<X>;
 >x : X
 >X : X
->B : B
+>B : B<U>
 >X : X
 }
 
@@ -37,7 +37,7 @@ interface I2 {
 >Y : Y
 >x : Y
 >Y : Y
->C : C
+>C : C<V>
 >Y : Y
 }
 
@@ -46,7 +46,7 @@ var a: { new<Z>(x: Z): B<Z> }
 >Z : Z
 >x : Z
 >Z : Z
->B : B
+>B : B<U>
 >Z : Z
 
 var b = { new<A>(x: A) { return new C<A>(x); } };
@@ -65,12 +65,12 @@ var b = { new<A>(x: A) { return new C<A>(x); } };
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -79,12 +79,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -93,12 +93,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -135,12 +135,12 @@ function foo4(x: any) { }
 function foo8(x: B<string>);
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo8(x: I<string>); // BUG 832086
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string>): any; (x: I<string>): any; }
@@ -149,12 +149,12 @@ function foo8(x: any) { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo9(x: C<string>); // error
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -163,7 +163,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
@@ -177,7 +177,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : B<string>
->B : B
+>B : B<U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
@@ -191,12 +191,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo12(x: C<string>); // error
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -210,7 +210,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<V>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -219,7 +219,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
@@ -233,7 +233,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : I<string>
->I : I
+>I : I<X>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
index 532a9e9c8a8..28ef6a81505 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
@@ -34,7 +34,7 @@ interface I<T> {
 >T : T
 >y : T
 >T : T
->B : B
+>B : B<T>
 >T : T
 }
 
@@ -47,7 +47,7 @@ interface I2 {
 >T : T
 >y : T
 >T : T
->C : C
+>C : C<T>
 >T : T
 }
 
@@ -58,7 +58,7 @@ var a: { new<T>(x: T, y?: T): B<T> }
 >T : T
 >y : T
 >T : T
->B : B
+>B : B<T>
 >T : T
 
 var b = { new<T>(x: T, y?: T) { return new C<T>(x, y); } }; // not a construct signature, function called new
@@ -80,12 +80,12 @@ var b = { new<T>(x: T, y?: T) { return new C<T>(x, y); } }; // not a construct s
 function foo1b(x: B<string>);
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: B<string>); // error
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string>): any; (x: B<string>): any; }
@@ -94,12 +94,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -108,12 +108,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string>);
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: I<string>); // error
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string>): any; (x: I<string>): any; }
@@ -150,12 +150,12 @@ function foo4(x: any) { }
 function foo8(x: B<string>): string;
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo8(x: I<string>): number; // BUG 832086
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo8(x: any): any { }
 >foo8 : { (x: B<string>): string; (x: I<string>): number; }
@@ -164,12 +164,12 @@ function foo8(x: any): any { }
 function foo9(x: B<string>);
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo9(x: C<string>); // error, differ only by return type
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string>): any; (x: C<string>): any; }
@@ -178,7 +178,7 @@ function foo9(x: any) { }
 function foo10(x: B<string>);
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
@@ -192,7 +192,7 @@ function foo10(x: any) { }
 function foo11(x: B<string>);
 >foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : B<string>
->B : B
+>B : B<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
@@ -206,12 +206,12 @@ function foo11(x: any) { }
 function foo12(x: I<string>);
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string>): any; (x: C<string>): any; }
@@ -225,7 +225,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string>): any; }
@@ -234,7 +234,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string>);
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
@@ -248,7 +248,7 @@ function foo13(x: any) { }
 function foo14(x: I<string>);
 >foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : I<string>
->I : I
+>I : I<T>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
index e7a435a9194..e75f1ce7cbb 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
@@ -37,7 +37,7 @@ interface I<T, U> {
 >T : T
 >y : U
 >U : U
->B : B
+>B : B<T, U>
 >T : T
 >U : U
 }
@@ -52,7 +52,7 @@ interface I2 {
 >T : T
 >y : U
 >U : U
->C : C
+>C : C<T, U>
 >T : T
 >U : U
 }
@@ -65,7 +65,7 @@ var a: { new<T, U>(x: T, y?: U): B<T,U> }
 >T : T
 >y : U
 >U : U
->B : B
+>B : B<T, U>
 >T : T
 >U : U
 
@@ -90,12 +90,12 @@ var b = { new<T, U>(x: T, y?: U) { return new C<T, U>(x, y); } }; // not a const
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -104,12 +104,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -118,12 +118,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -160,12 +160,12 @@ function foo4(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo8(x: I<string, number>); // BUG 832086
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -174,12 +174,12 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo9(x: C<string, number>); // error
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -188,7 +188,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -202,7 +202,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
@@ -216,12 +216,12 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo12(x: C<string, number>); // BUG 832086
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -235,7 +235,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, number>); // ok
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -244,7 +244,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -258,7 +258,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
index b8cf86ac003..5f5d592df34 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
@@ -37,7 +37,7 @@ interface I<T, U> {
 >T : T
 >y : U
 >U : U
->B : B
+>B : B<T, U>
 >T : T
 >U : U
 }
@@ -52,7 +52,7 @@ interface I2 {
 >T : T
 >y : U
 >U : U
->C : C
+>C : C<T, U>
 >T : T
 >U : U
 }
@@ -65,7 +65,7 @@ var a: { new <T, U>(x: T, y?: U): B<T, U> };
 >T : T
 >y : U
 >U : U
->B : B
+>B : B<T, U>
 >T : T
 >U : U
 
@@ -90,12 +90,12 @@ var b = { new<T, U>(x: T, y: U) { return new C<T, U>(x, y); } }; // not a constr
 function foo1b(x: B<string, number>);
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: B<string, number>); // error
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo1b(x: any) { }
 >foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
@@ -104,12 +104,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string, number>);
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: C<string, number>); // error
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
@@ -118,12 +118,12 @@ function foo1c(x: any) { }
 function foo2(x: I<string, number>);
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: I<string, number>); // error
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo2(x: any) { }
 >foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
@@ -160,12 +160,12 @@ function foo4(x: any) { }
 function foo8(x: B<string, number>);
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo8(x: I<string, number>); // BUG 832086
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo8(x: any) { }
 >foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
@@ -174,12 +174,12 @@ function foo8(x: any) { }
 function foo9(x: B<string, number>);
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo9(x: C<string, number>); // error, differ only by return type
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo9(x: any) { }
 >foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
@@ -188,7 +188,7 @@ function foo9(x: any) { }
 function foo10(x: B<string, number>);
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo10(x: typeof a); // BUG 832086
 >foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -202,7 +202,7 @@ function foo10(x: any) { }
 function foo11(x: B<string, number>);
 >foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : B<string, number>
->B : B
+>B : B<T, U>
 
 function foo11(x: typeof b); // ok
 >foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
@@ -216,12 +216,12 @@ function foo11(x: any) { }
 function foo12(x: I<string, number>);
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo12(x: C<string, number>); // ok
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12(x: any) { }
 >foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
@@ -235,7 +235,7 @@ function foo12b(x: I2);
 function foo12b(x: C<string, number>); // BUG 832086
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
->C : C
+>C : C<T, U>
 
 function foo12b(x: any) { }
 >foo12b : { (x: I2): any; (x: C<string, number>): any; }
@@ -244,7 +244,7 @@ function foo12b(x: any) { }
 function foo13(x: I<string, number>);
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo13(x: typeof a); // BUG 832086
 >foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
@@ -258,7 +258,7 @@ function foo13(x: any) { }
 function foo14(x: I<string, number>);
 >foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : I<string, number>
->I : I
+>I : I<T, U>
 
 function foo14(x: typeof b); // ok
 >foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 3524cc78f76..ab83b0c78f0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -84,12 +84,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -159,7 +159,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -243,7 +243,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -313,7 +313,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index e8bc9e5037b..cd8f19b2b7e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -100,12 +100,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -175,7 +175,7 @@ function foo5b(x: A);
 function foo5b(x: C<Derived>); // ok
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C
+>C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
@@ -260,7 +260,7 @@ function foo9(x: B);
 function foo9(x: C<Base>); // ok
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
->C : C
+>C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
@@ -331,7 +331,7 @@ function foo12(x: I);
 function foo12(x: C<Derived>); // error
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C
+>C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index 9c2851d405c..6a73749fc84 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -84,12 +84,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -159,7 +159,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -243,7 +243,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // ok
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -313,7 +313,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.types b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
index 5cd444c9675..0ca5b552bf5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.types
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
@@ -132,7 +132,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // ok
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.types b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
index a9b6650fbfe..391f6f1f200 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
@@ -81,12 +81,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -156,7 +156,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // no error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -240,7 +240,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // no error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -310,7 +310,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // no error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
index 95b5b06e056..a29edc75162 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
@@ -13,19 +13,19 @@ class C<T> {
 class D<T> extends C<T> {
 >D : D<T>
 >T : T
->C : C
+>C : C<T>
 >T : T
 }
 
 function foo1(x: C<string>);
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1(x: C<number>); // ok
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo1(x: any) { }
 >foo1 : { (x: C<string>): any; (x: C<number>): any; }
@@ -34,12 +34,12 @@ function foo1(x: any) { }
 function foo2(x: D<string>);
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<string>
->D : D
+>D : D<T>
 
 function foo2(x: D<number>); // ok
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<number>
->D : D
+>D : D<T>
 
 function foo2(x: any) { }
 >foo2 : { (x: D<string>): any; (x: D<number>): any; }
@@ -48,12 +48,12 @@ function foo2(x: any) { }
 function foo3(x: C<string>);
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo3(x: D<number>); // ok
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : D<number>
->D : D
+>D : D<T>
 
 function foo3(x: any) { }
 >foo3 : { (x: C<string>): any; (x: D<number>): any; }
@@ -62,12 +62,12 @@ function foo3(x: any) { }
 function foo4(x: C<number>): number; 
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo4(x: D<number>): string; // BUG 831926
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D
+>D : D<T>
 
 function foo4(x: any): any { }
 >foo4 : { (x: C<number>): number; (x: D<number>): string; }
@@ -90,12 +90,12 @@ var r = foo4(new D<number>());
 function foo5(x: C<number>): number;
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo5(x: C<number>): string; // error
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
->C : C
+>C : C<T>
 
 function foo5(x: any): any { }
 >foo5 : { (x: C<number>): number; (x: C<number>): string; }
@@ -104,12 +104,12 @@ function foo5(x: any): any { }
 function foo6(x: D<number>): number;
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D
+>D : D<T>
 
 function foo6(x: D<number>): string; // error
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
->D : D
+>D : D<T>
 
 function foo6(x: any): any { }
 >foo6 : { (x: D<number>): number; (x: D<number>): string; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.types b/tests/baselines/reference/objectTypesIdentityWithPublics.types
index dcb53a0c419..411fe4fb88e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.types
@@ -71,12 +71,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -146,7 +146,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -202,7 +202,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -244,7 +244,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index c4613c0b62f..83a73646874 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -84,12 +84,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -159,7 +159,7 @@ function foo5b(x: A);
 function foo5b(x: C<string>); // error
 >foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo5b(x: any) { }
 >foo5b : { (x: A): any; (x: C<string>): any; }
@@ -243,7 +243,7 @@ function foo9(x: B);
 function foo9(x: C<string>); // error
 >foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo9(x: any) { }
 >foo9 : { (x: B): any; (x: C<string>): any; }
@@ -313,7 +313,7 @@ function foo12(x: I);
 function foo12(x: C<string>); // error
 >foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo12(x: any) { }
 >foo12 : { (x: I): any; (x: C<string>): any; }
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
index 90f9d5acef8..c621be1e26b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
@@ -100,12 +100,12 @@ function foo1b(x: any) { }
 function foo1c(x: C<string>);
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: C<string>); // error
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
->C : C
+>C : C<T>
 
 function foo1c(x: any) { }
 >foo1c : { (x: C<string>): any; (x: C<string>): any; }
@@ -175,7 +175,7 @@ function foo5b(x: A);
 function foo5b(x: C<Derived>); // ok
 >foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C
+>C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
@@ -260,7 +260,7 @@ function foo9(x: B);
 function foo9(x: C<Base>); // ok
 >foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
->C : C
+>C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
@@ -331,7 +331,7 @@ function foo12(x: I);
 function foo12(x: C<Derived>); // error
 >foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
->C : C
+>C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.types b/tests/baselines/reference/overloadEquivalenceWithStatics.types
index 6c55c8aeb0c..96ad16ae19c 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.types
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.types
@@ -7,9 +7,9 @@ static B<S>(v: A1<S>): A1<S>; // 1
 >B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
 >S : S
 >v : A1<S>
->A1 : A1
+>A1 : A1<T>
 >S : S
->A1 : A1
+>A1 : A1<T>
 >S : S
 
 static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
@@ -17,14 +17,14 @@ static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
 >S : S
 >v : S
 >S : S
->A1 : A1
+>A1 : A1<T>
 >S : S
 
 static B<S>(v: any): A1<S> {
 >B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
 >S : S
 >v : any
->A1 : A1
+>A1 : A1<T>
 >S : S
 
 return null;
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
index 8e45d35defe..17ecdeac503 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
@@ -13,7 +13,7 @@ class A<U>{
 
     GetEnumerator: () => B<U>;
 >GetEnumerator : () => B<U>
->B : B
+>B : B<V>
 >U : U
 }
 function Choice<T>(...v_args: T[]): A<T>;
@@ -21,7 +21,7 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 >v_args : T[]
 >T : T
->A : A
+>A : A<U>
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T> {
@@ -29,7 +29,7 @@ function Choice<T>(...v_args: T[]): A<T> {
 >T : T
 >v_args : T[]
 >T : T
->A : A
+>A : A<U>
 >T : T
 
     return new A<T>();
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
index 3277cf78488..c0d0533a533 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
@@ -35,7 +35,7 @@ function f<T>(a: X<T>): B;
 >f : { (a: X1): A; <T>(a: X<T>): B; }
 >T : T
 >a : X<T>
->X : X
+>X : X<T>
 >T : T
 >B : B
 
@@ -46,7 +46,7 @@ function f(a): any {
 
 var xs: X<string>;
 >xs : X<string>
->X : X
+>X : X<T>
 
 var t3 = f(xs);
 >t3 : A
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.types b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
index a8e9e685d89..bd60fc16fe0 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.types
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
@@ -7,9 +7,9 @@ class A<T> {
 >B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
 >S : S
 >v : A<S>
->A : A
+>A : A<T>
 >S : S
->A : A
+>A : A<T>
 >S : S
 
     static B<S>(v: S): A<S>;
@@ -17,14 +17,14 @@ class A<T> {
 >S : S
 >v : S
 >S : S
->A : A
+>A : A<T>
 >S : S
 
     static B<S>(v: any): A<S> {
 >B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
 >S : S
 >v : any
->A : A
+>A : A<T>
 >S : S
 
         return null;
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.types b/tests/baselines/reference/prespecializedGenericMembers1.types
index cf63b5ac469..09578f323ca 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.types
+++ b/tests/baselines/reference/prespecializedGenericMembers1.types
@@ -20,7 +20,7 @@ export class CatBag {
     constructor(cats: { barry: Cat<IKitty>; }) {
 >cats : { barry: Cat<IKitty>; }
 >barry : Cat<IKitty>
->Cat : Cat
+>Cat : Cat<CatType>
 >IKitty : IKitty
         
     }
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index 3cd86aa1aa7..d38d223bae7 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -15,9 +15,9 @@ module Query {
 >T : T
 >doWhile : (test: Iterator<T>) => boolean
 >test : Iterator<T>
->Iterator : Iterator
+>Iterator : Iterator<T>
 >T : T
->Iterator : Iterator
+>Iterator : Iterator<T>
 >T : T
 
         return null;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index 4cc031cd304..6615a3c9af0 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -16,7 +16,7 @@ module Q {
 >T : T
 >x : (a: Iterator<T>) => number
 >a : Iterator<T>
->Iterator : Iterator
+>Iterator : Iterator<T>
 >T : T
 
         return x;
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
index 15882caf485..0d46d4ab12b 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.types
@@ -13,7 +13,7 @@ export interface A<T> {
 export interface B<T> extends A<T> {
 >B : B<T>
 >T : T
->A : A
+>A : A<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
index 6ad344e5c30..125cfc9d597 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
@@ -13,9 +13,9 @@ interface Foo<T> {
 }
 var Foo: new () => Foo.A<Foo<string>>;
 >Foo : new () => A<Foo<string>>
->Foo : Foo
->A : A
->Foo : Foo
+>Foo : Foo<T>
+>A : A<T>
+>Foo : Foo<T>
 
 export = Foo;
 >Foo : Foo<T>
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
index 10ae8752030..8c89db63515 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
@@ -12,7 +12,7 @@ function Foo<T>(array: T[]): Foo<T> {
 >T : T
 >array : T[]
 >T : T
->Foo : Foo
+>Foo : Foo<T>
 >T : T
 
     return undefined;
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
index 6b134f45d0d..2259b039c91 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
@@ -10,7 +10,7 @@ interface Bar {
 
     foo: Foo<number>;
 >foo : Foo<number>
->Foo : Foo
+>Foo : Foo<A>
 }
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts ===
 export = Foo;
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
index cbea6d73932..2000b877abd 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.types
@@ -6,7 +6,7 @@ export class A<T1>{
     constructor(callback: (self: A<T1>) => void) {
 >callback : (self: A<T1>) => void
 >self : A<T1>
->A : A
+>A : A<T1>
 >T1 : T1
 
         var child = new B(this);
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.types b/tests/baselines/reference/privacyTypeParametersOfInterface.types
index 6a608169b7c..0a72d093e04 100644
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.types
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.types
@@ -31,27 +31,27 @@ export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass
 
     myMethod0(): publicClassT<T>; // error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 
     myMethod1(): privateClassT<privateClass>; // error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >publicClass : publicClass
 }
 
@@ -68,27 +68,27 @@ export interface publicInterfaceWithPublicTypeParameters<T extends publicClass>
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 
     myMethod1(): privateClassT<privateClass>; // error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >publicClass : publicClass
 }
 
@@ -105,27 +105,27 @@ interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 
     myMethod1(): privateClassT<privateClass>; // No error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // No error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //No error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >publicClass : publicClass
 }
 
@@ -142,27 +142,27 @@ interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 
     myMethod1(): privateClassT<privateClass>; // No error
 >myMethod1 : () => privateClassT<privateClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >privateClass : privateClass
 
     myMethod2(): privateClassT<publicClass>; // No error
 >myMethod2 : () => privateClassT<publicClass>
->privateClassT : privateClassT
+>privateClassT : privateClassT<T>
 >publicClass : publicClass
 
     myMethod3(): publicClassT<privateClass>; //No error
 >myMethod3 : () => publicClassT<privateClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >privateClass : privateClass
 
     myMethod4(): publicClassT<publicClass>; // no error
 >myMethod4 : () => publicClassT<publicClass>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >publicClass : publicClass
 }
 
@@ -178,7 +178,7 @@ export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 }
 
@@ -194,6 +194,6 @@ interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
 
     myMethod0(): publicClassT<T>; // No error
 >myMethod0 : () => publicClassT<T>
->publicClassT : publicClassT
+>publicClassT : publicClassT<T>
 >T : T
 }
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
index 69dbaf2723b..6edb6c6d09f 100644
--- a/tests/baselines/reference/promiseChaining.types
+++ b/tests/baselines/reference/promiseChaining.types
@@ -14,7 +14,7 @@ class Chain<T> {
 >x : T
 >T : T
 >S : S
->Chain : Chain
+>Chain : Chain<T>
 >S : S
 
         var result = cb(this.value);
diff --git a/tests/baselines/reference/promiseIdentity.types b/tests/baselines/reference/promiseIdentity.types
index 94f041885f9..2be853c9964 100644
--- a/tests/baselines/reference/promiseIdentity.types
+++ b/tests/baselines/reference/promiseIdentity.types
@@ -9,9 +9,9 @@ interface IPromise<T> {
 >callback : (x: T) => IPromise<U>
 >x : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 }
 interface Promise<T> {
@@ -24,18 +24,18 @@ interface Promise<T> {
 >callback : (x: T) => Promise<U>
 >x : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 }
 var x: IPromise<string>;
 >x : IPromise<string>
->IPromise : IPromise
+>IPromise : IPromise<T>
 
 var x: Promise<string>;
 >x : IPromise<string>
->Promise : Promise
+>Promise : Promise<T>
 
 
 interface IPromise2<T, V> {
@@ -50,10 +50,10 @@ interface IPromise2<T, V> {
 >callback : (x: T) => IPromise2<U, W>
 >x : T
 >T : T
->IPromise2 : IPromise2
+>IPromise2 : IPromise2<T, V>
 >U : U
 >W : W
->IPromise2 : IPromise2
+>IPromise2 : IPromise2<T, V>
 >W : W
 >U : U
 }
@@ -69,10 +69,10 @@ interface Promise2<T, V> {
 >callback : (x: V) => Promise2<U, T>
 >x : V
 >V : V
->Promise2 : Promise2
+>Promise2 : Promise2<T, V>
 >U : U
 >T : T
->Promise2 : Promise2
+>Promise2 : Promise2<T, V>
 >T : T
 >W : W
 }
@@ -81,9 +81,9 @@ interface Promise2<T, V> {
 // Also, the V of Promise2 happens to coincide with the T of IPromise2 (they are both string).
 var y: IPromise2<string, number>;
 >y : IPromise2<string, number>
->IPromise2 : IPromise2
+>IPromise2 : IPromise2<T, V>
 
 var y: Promise2<any, string>;
 >y : IPromise2<string, number>
->Promise2 : Promise2
+>Promise2 : Promise2<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentityWithAny.types b/tests/baselines/reference/promiseIdentityWithAny.types
index 7562efc257b..f96e6d90363 100644
--- a/tests/baselines/reference/promiseIdentityWithAny.types
+++ b/tests/baselines/reference/promiseIdentityWithAny.types
@@ -11,10 +11,10 @@ interface IPromise<T, V> {
 >callback : (x: T) => IPromise<U, W>
 >x : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 >U : U
 >W : W
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 >U : U
 >W : W
 }
@@ -30,16 +30,16 @@ interface Promise<T, V> {
 >callback : (x: T) => Promise<any, any>
 >x : T
 >T : T
->Promise : Promise
->Promise : Promise
+>Promise : Promise<T, V>
+>Promise : Promise<T, V>
 }
 
 // Should be ok because signature type parameters get erased to any
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 
 var x: Promise<string, boolean>;
 >x : IPromise<string, number>
->Promise : Promise
+>Promise : Promise<T, V>
 
diff --git a/tests/baselines/reference/promiseIdentityWithConstraints.types b/tests/baselines/reference/promiseIdentityWithConstraints.types
index 77315c1093f..5bc321cbb16 100644
--- a/tests/baselines/reference/promiseIdentityWithConstraints.types
+++ b/tests/baselines/reference/promiseIdentityWithConstraints.types
@@ -13,10 +13,10 @@ interface IPromise<T, V> {
 >callback : (x: T) => IPromise<U, W>
 >x : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 >U : U
 >W : W
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 >U : U
 >W : W
 }
@@ -34,10 +34,10 @@ interface Promise<T, V> {
 >callback : (x: T) => Promise<U, W>
 >x : T
 >T : T
->Promise : Promise
+>Promise : Promise<T, V>
 >U : U
 >W : W
->Promise : Promise
+>Promise : Promise<T, V>
 >U : U
 >W : W
 }
@@ -45,9 +45,9 @@ interface Promise<T, V> {
 // Error because constraint V doesn't match
 var x: IPromise<string, number>;
 >x : IPromise<string, number>
->IPromise : IPromise
+>IPromise : IPromise<T, V>
 
 var x: Promise<string, boolean>;
 >x : IPromise<string, number>
->Promise : Promise
+>Promise : Promise<T, V>
 
diff --git a/tests/baselines/reference/promiseTest.types b/tests/baselines/reference/promiseTest.types
index a125c5fe893..6f67484ab77 100644
--- a/tests/baselines/reference/promiseTest.types
+++ b/tests/baselines/reference/promiseTest.types
@@ -10,9 +10,9 @@ interface Promise<T> {
 >success : (value: T) => Promise<A>
 >value : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >A : A
->Promise : Promise
+>Promise : Promise<T>
 >A : A
 
     then<B>(success?: (value: T) => B): Promise<B>;
@@ -22,7 +22,7 @@ interface Promise<T> {
 >value : T
 >T : T
 >B : B
->Promise : Promise
+>Promise : Promise<T>
 >B : B
 
     data: T;
@@ -32,7 +32,7 @@ interface Promise<T> {
 
 var p: Promise<number> = null;
 >p : Promise<number>
->Promise : Promise
+>Promise : Promise<T>
 
 var p2 = p.then(function (x) {
 >p2 : Promise<number>
diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types
index 75fea426f81..52d026adb1d 100644
--- a/tests/baselines/reference/promiseTypeInference.types
+++ b/tests/baselines/reference/promiseTypeInference.types
@@ -9,9 +9,9 @@ declare class Promise<T> {
 >success : (value: T) => Promise<U>
 >value : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 }
 interface IPromise<T> {
@@ -24,20 +24,20 @@ interface IPromise<T> {
 >success : (value: T) => IPromise<U>
 >value : T
 >T : T
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
->IPromise : IPromise
+>IPromise : IPromise<T>
 >U : U
 }
 declare function load(name: string): Promise<string>;
 >load : (name: string) => Promise<string>
 >name : string
->Promise : Promise
+>Promise : Promise<T>
 
 declare function convert(s: string): IPromise<number>;
 >convert : (s: string) => IPromise<number>
 >s : string
->IPromise : IPromise
+>IPromise : IPromise<T>
 
 var $$x = load("something").then(s => convert(s));
 >$$x : Promise<number>
diff --git a/tests/baselines/reference/promises.types b/tests/baselines/reference/promises.types
index 00df270d2d7..639d28677d7 100644
--- a/tests/baselines/reference/promises.types
+++ b/tests/baselines/reference/promises.types
@@ -10,7 +10,7 @@ interface Promise<T> {
 >value : T
 >T : T
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 
     then<U>(success?: (value: T) => Promise<U>): Promise<U>;
@@ -19,9 +19,9 @@ interface Promise<T> {
 >success : (value: T) => Promise<U>
 >value : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 
     value: T;
diff --git a/tests/baselines/reference/promisesWithConstraints.types b/tests/baselines/reference/promisesWithConstraints.types
index c1c7c1adac2..a8c4c64d3fd 100644
--- a/tests/baselines/reference/promisesWithConstraints.types
+++ b/tests/baselines/reference/promisesWithConstraints.types
@@ -9,9 +9,9 @@ interface Promise<T> {
 >cb : (x: T) => Promise<U>
 >x : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 }
 
@@ -27,9 +27,9 @@ interface CPromise<T extends { x: any; }> {
 >cb : (x: T) => Promise<U>
 >x : T
 >T : T
->Promise : Promise
+>Promise : Promise<T>
 >U : U
->Promise : Promise
+>Promise : Promise<T>
 >U : U
 }
 
@@ -44,12 +44,12 @@ interface Bar { x; y; }
 
 var a: Promise<Foo>;
 >a : Promise<Foo>
->Promise : Promise
+>Promise : Promise<T>
 >Foo : Foo
 
 var b: Promise<Bar>;
 >b : Promise<Bar>
->Promise : Promise
+>Promise : Promise<T>
 >Bar : Bar
 
 a = b; // ok
@@ -64,12 +64,12 @@ b = a; // ok
 
 var a2: CPromise<Foo>;
 >a2 : CPromise<Foo>
->CPromise : CPromise
+>CPromise : CPromise<T>
 >Foo : Foo
 
 var b2: CPromise<Bar>;
 >b2 : CPromise<Bar>
->CPromise : CPromise
+>CPromise : CPromise<T>
 >Bar : Bar
 
 a2 = b2; // ok
diff --git a/tests/baselines/reference/propagationOfPromiseInitialization.types b/tests/baselines/reference/propagationOfPromiseInitialization.types
index a8a71a3db23..d7b97721320 100644
--- a/tests/baselines/reference/propagationOfPromiseInitialization.types
+++ b/tests/baselines/reference/propagationOfPromiseInitialization.types
@@ -13,13 +13,13 @@ interface IPromise<T> {
 >errorCallback : (reason: any) => TResult
 >reason : any
 >TResult : TResult
->IPromise : IPromise
+>IPromise : IPromise<T>
 >TResult : TResult
 }
 
 var foo: IPromise<number>;
 >foo : IPromise<number>
->IPromise : IPromise
+>IPromise : IPromise<T>
 
 foo.then((x) => {
 >foo.then((x) => {
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
index 23b5c287619..d6779649c30 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
@@ -51,7 +51,7 @@ interface I<T extends Date> {
 }
 var i: I<Date>;
 >i : I<Date>
->I : I
+>I : I<T>
 >Date : Date
 
 var r2 = i.foo.getDate();
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
index 55868ad5bca..f7bf888533b 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
@@ -121,7 +121,7 @@ interface I<U extends A, T extends A> {
 //}
 var i: I<B, A>;
 >i : I<B, A>
->I : I
+>I : I<U, T>
 >B : B
 >A : A
 
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
index 41837d9b6aa..c78a6608aa3 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
@@ -45,7 +45,7 @@ interface I<T> {
 }
 var i: I<number>;
 >i : I<number>
->I : I
+>I : I<T>
 
 var r2 = i.foo.toString();
 >r2 : string
diff --git a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
index 09940d01e15..9778480426a 100644
--- a/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
+++ b/tests/baselines/reference/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.types
@@ -11,7 +11,7 @@ module Beta {
 
     import p = Alpha.x;
 >p : number
->Alpha : number
+>Alpha : typeof Alpha
 >x : number
 }
 
diff --git a/tests/baselines/reference/recursiveGenericMethodCall.types b/tests/baselines/reference/recursiveGenericMethodCall.types
index 2e51cc061c8..ef03ca545df 100644
--- a/tests/baselines/reference/recursiveGenericMethodCall.types
+++ b/tests/baselines/reference/recursiveGenericMethodCall.types
@@ -8,7 +8,7 @@ function Generate<T>(func: Generator<T>): T {
 >Generate : <T>(func: Generator<T>) => T
 >T : T
 >func : Generator<T>
->Generator : Generator
+>Generator : Generator<T>
 >T : T
 >T : T
 
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError1.types b/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
index 85790394381..9e6f5727142 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError1.types
@@ -9,13 +9,13 @@ interface Foo<T> {
 
     z: Foo<X<T>>; // error
 >z : Foo<X<T>>
->Foo : Foo
->X : X
+>Foo : Foo<T>
+>X : X<T>
 >T : T
 }
 var f: Foo<number>;
 >f : Foo<number>
->Foo : Foo
+>Foo : Foo<T>
 
 var r = f.z; 
 >r : Foo<X<number>>
@@ -38,13 +38,13 @@ interface Foo2<T> {
 
     ofC4: C2<{ x: T }> // ok
 >ofC4 : C2<{ x: T; }>
->C2 : C2
+>C2 : C2<T>
 >x : T
 >T : T
 }
 var f2: Foo2<number>;
 >f2 : Foo2<number>
->Foo2 : Foo2
+>Foo2 : Foo2<T>
 
 var r2 = f2.ofC4;
 >r2 : C2<{ x: number; }>
diff --git a/tests/baselines/reference/recursiveTypeParameterReferenceError2.types b/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
index 0f7f55244b5..e6cc0e4a365 100644
--- a/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
+++ b/tests/baselines/reference/recursiveTypeParameterReferenceError2.types
@@ -9,13 +9,13 @@ interface List<T> {
 
     next: List<T>;
 >next : List<T>
->List : List
+>List : List<T>
 >T : T
 
     owner: List<List<T>>;  // Error, recursive reference with wrapped T
 >owner : List<List<T>>
->List : List
->List : List
+>List : List<T>
+>List : List<T>
 >T : T
 }
 
@@ -29,12 +29,12 @@ interface List2<T> {
 
     next: List2<T>;
 >next : List2<T>
->List2 : List2
+>List2 : List2<T>
 >T : T
 
     owner: List2<List2<string>>;  // Ok
 >owner : List2<List2<string>>
->List2 : List2
->List2 : List2
+>List2 : List2<T>
+>List2 : List2<T>
 }
 
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
index c036de245ea..bccd226ceba 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
@@ -12,7 +12,7 @@ module MsPortal.Controls.Base.ItemList {
         // Removing this line fixes the constructor of ItemValue
         options: ViewModel<TValue>;
 >options : ViewModel<TValue>
->ViewModel : ViewModel
+>ViewModel : ViewModel<TValue>
 >TValue : TValue
     }    
 
@@ -29,7 +29,7 @@ module MsPortal.Controls.Base.ItemList {
     export class ViewModel<TValue> extends ItemValue<TValue> {
 >ViewModel : ViewModel<TValue>
 >TValue : TValue
->ItemValue : ItemValue
+>ItemValue : ItemValue<T>
 >TValue : TValue
     }
 }
diff --git a/tests/baselines/reference/reorderProperties.types b/tests/baselines/reference/reorderProperties.types
index f45543d8aa0..2e2939815f2 100644
--- a/tests/baselines/reference/reorderProperties.types
+++ b/tests/baselines/reference/reorderProperties.types
@@ -20,8 +20,8 @@ interface B<T> {
 interface C<S> extends A<D<S>> {
 >C : C<S>
 >S : S
->A : A
->D : D
+>A : A<T>
+>D : D<S>
 >S : S
 
     y: S
@@ -32,8 +32,8 @@ interface C<S> extends A<D<S>> {
 interface D<S> extends B<C<S>> {
 >D : D<S>
 >S : S
->B : B
->C : C
+>B : B<T>
+>C : C<S>
 >S : S
 
     y: S
@@ -43,13 +43,13 @@ interface D<S> extends B<C<S>> {
 
 var c: C<{ s: string; n: number }>
 >c : C<{ s: string; n: number; }>
->C : C
+>C : C<S>
 >s : string
 >n : number
 
 var d: D<{ n: number; s: string }> = c
 >d : D<{ n: number; s: string; }>
->D : D
+>D : D<S>
 >n : number
 >s : string
 >c : C<{ s: string; n: number; }>
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
index 96515f82d12..01e88e83e91 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
@@ -5,7 +5,7 @@ module rionegrensis {
   export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
 >caniventer : caniventer
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
@@ -48,9 +48,9 @@ module rionegrensis {
     Uranium() : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri> { var x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>; () => { var y = this; }; return x; }
 >Uranium : () => inez<inez<stolzmanni, melanops>, falconeri>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -59,9 +59,9 @@ module rionegrensis {
 >falconeri : falconeri
 >x : inez<inez<stolzmanni, melanops>, falconeri>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -90,7 +90,7 @@ module rionegrensis {
 >T0 : T0
 >T1 : T1
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -99,22 +99,22 @@ module rionegrensis {
     naso() : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>> { var x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>; () => { var y = this; }; return x; }
 >naso : () => setulosus<punicus, coludo<bobrinskoi, melanoleuca>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : setulosus<punicus, coludo<bobrinskoi, melanoleuca>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >provocax : provocax
@@ -127,14 +127,14 @@ module rionegrensis {
     vancouverensis() : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae> { var x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>; () => { var y = this; }; return x; }
 >vancouverensis : () => ciliolabrum<oreas, peninsulae>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >argurus : argurus
 >peninsulae : peninsulae
 >x : ciliolabrum<oreas, peninsulae>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >argurus : argurus
@@ -147,30 +147,30 @@ module rionegrensis {
     africana() : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>> { var x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
 >africana : () => gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
 >oreas : oreas
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
 >oreas : oreas
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -229,14 +229,14 @@ module julianae {
     maxwellii() : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops> { var x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>; () => { var y = this; }; return x; }
 >maxwellii : () => Praseodymium<jugularis, melanops>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >dammermani : dammermani
 >melanops : melanops
 >x : Praseodymium<jugularis, melanops>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >dammermani : dammermani
@@ -249,14 +249,14 @@ module julianae {
     endoi() : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni> { var x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>; () => { var y = this; }; return x; }
 >endoi : () => abidi<kaiseri, wilsoni>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
 >wilsoni : wilsoni
 >x : abidi<kaiseri, wilsoni>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
@@ -296,14 +296,14 @@ module julianae {
     isabellae() : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis> { var x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>; () => { var y = this; }; return x; }
 >isabellae : () => amphibius<daphaenodon, uralensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >x : amphibius<daphaenodon, uralensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
@@ -340,14 +340,14 @@ module julianae {
     gliroides() : howi.coludo<howi.marcanoi, lavali.wilsoni> { var x : howi.coludo<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
 >gliroides : () => coludo<marcanoi, wilsoni>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >lavali : lavali
 >wilsoni : wilsoni
 >x : coludo<marcanoi, wilsoni>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >lavali : lavali
@@ -384,14 +384,14 @@ module julianae {
     stuhlmanni() : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus> { var x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >stuhlmanni : () => linulus<megaphyllus, megaphyllus>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >x : linulus<megaphyllus, megaphyllus>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >caurinus : caurinus
@@ -409,22 +409,22 @@ module julianae {
     mattheyi() : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >mattheyi : () => fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -447,14 +447,14 @@ module julianae {
     vincenti() : argurus.dauricus<macrorhinos.konganensis, patas.uralensis> { var x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>; () => { var y = this; }; return x; }
 >vincenti : () => dauricus<konganensis, uralensis>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >patas : patas
 >uralensis : uralensis
 >x : dauricus<konganensis, uralensis>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >patas : patas
@@ -544,22 +544,22 @@ module julianae {
     bindi() : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >bindi : () => mahaganus<amicus, amphibius<daphaenodon, uralensis>>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >x : mahaganus<amicus, amphibius<daphaenodon, uralensis>>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
@@ -596,9 +596,9 @@ module julianae {
     ignitus() : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni> { var x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >ignitus : () => rosalia<setulosus<echinatus, steerii>, wilsoni>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >steerii : steerii
@@ -606,9 +606,9 @@ module julianae {
 >wilsoni : wilsoni
 >x : rosalia<setulosus<echinatus, steerii>, wilsoni>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >steerii : steerii
@@ -644,11 +644,11 @@ module julianae {
     unalascensis() : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata> { var x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>; () => { var y = this; }; return x; }
 >unalascensis : () => inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -659,11 +659,11 @@ module julianae {
 >aurata : aurata
 >x : inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -680,9 +680,9 @@ module julianae {
     wuchihensis() : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla> { var x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >wuchihensis : () => angulatus<coludo<carolinensis, portoricensis>, minutilla>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
@@ -691,9 +691,9 @@ module julianae {
 >minutilla : minutilla
 >x : angulatus<coludo<carolinensis, portoricensis>, minutilla>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
@@ -720,14 +720,14 @@ module julianae {
     ordii() : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni> { var x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >ordii : () => arboreus<germaini, stolzmanni>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : arboreus<germaini, stolzmanni>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
@@ -757,14 +757,14 @@ module julianae {
     wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >wolffsohni : () => suillus<melanops, carolinensis>
 >Lanthanum : Lanthanum
->suillus : suillus
+>suillus : suillus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : suillus<melanops, carolinensis>
 >Lanthanum : Lanthanum
->suillus : suillus
+>suillus : suillus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >quasiater : quasiater
@@ -777,13 +777,13 @@ module julianae {
     geata() : ruatanica.hector<sumatrana, quasiater.bobrinskoi> { var x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >geata : () => hector<sumatrana, bobrinskoi>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >sumatrana : sumatrana
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >x : hector<sumatrana, bobrinskoi>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >sumatrana : sumatrana
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
@@ -807,13 +807,13 @@ module julianae {
     sturdeei() : lutreolus.cor<Lanthanum.jugularis, galapagoensis> { var x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>; () => { var y = this; }; return x; }
 >sturdeei : () => cor<jugularis, galapagoensis>
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >galapagoensis : galapagoensis
 >x : cor<jugularis, galapagoensis>
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >galapagoensis : galapagoensis
@@ -825,20 +825,20 @@ module julianae {
     pachyurus() : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >pachyurus : () => angulatus<aurata, gerbillus<thaeleri, carolinensis>>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : angulatus<aurata, gerbillus<thaeleri, carolinensis>>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
@@ -863,14 +863,14 @@ module julianae {
     neohibernicus() : dammermani.siberu<lutreolus.foina, samarensis.pallidus> { var x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>; () => { var y = this; }; return x; }
 >neohibernicus : () => siberu<foina, pallidus>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
 >pallidus : pallidus
 >x : siberu<foina, pallidus>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -888,14 +888,14 @@ module julianae {
     pundti() : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus> { var x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
 >pundti : () => sicarius<koepckeae, psilurus>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >caurinus : caurinus
 >psilurus : psilurus
 >x : sicarius<koepckeae, psilurus>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >caurinus : caurinus
@@ -944,14 +944,14 @@ module julianae {
     diazi() : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops> { var x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>; () => { var y = this; }; return x; }
 >diazi : () => lasiurus<foina, melanops>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
 >melanops : melanops
 >x : lasiurus<foina, melanops>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
@@ -988,14 +988,14 @@ module julianae {
     muscina() : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae> { var x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>; () => { var y = this; }; return x; }
 >muscina : () => arboreus<minutilla, peninsulae>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >argurus : argurus
 >peninsulae : peninsulae
 >x : arboreus<minutilla, peninsulae>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >argurus : argurus
@@ -1008,14 +1008,14 @@ module julianae {
     pelengensis() : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus> { var x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >pelengensis : () => leptoceros<psilurus, echinatus>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : leptoceros<psilurus, echinatus>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >gabriellae : gabriellae
@@ -1067,14 +1067,14 @@ module julianae {
     minous() : argurus.dauricus<quasiater.carolinensis, lavali.otion> { var x : argurus.dauricus<quasiater.carolinensis, lavali.otion>; () => { var y = this; }; return x; }
 >minous : () => dauricus<carolinensis, otion>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >otion : otion
 >x : dauricus<carolinensis, otion>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -1087,14 +1087,14 @@ module julianae {
     cinereiventer() : panamensis.setulosus<sagitta.walkeri, lavali.otion> { var x : panamensis.setulosus<sagitta.walkeri, lavali.otion>; () => { var y = this; }; return x; }
 >cinereiventer : () => setulosus<walkeri, otion>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >lavali : lavali
 >otion : otion
 >x : setulosus<walkeri, otion>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >lavali : lavali
@@ -1107,21 +1107,21 @@ module julianae {
     longicaudatus() : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>> { var x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>; () => { var y = this; }; return x; }
 >longicaudatus : () => marmosurus<melanops, mahaganus<nudicaudus, otion>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >nudicaudus : nudicaudus
 >lavali : lavali
 >otion : otion
 >x : marmosurus<melanops, mahaganus<nudicaudus, otion>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >nudicaudus : nudicaudus
 >lavali : lavali
 >otion : otion
@@ -1133,9 +1133,9 @@ module julianae {
     baeodon() : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa> { var x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>; () => { var y = this; }; return x; }
 >baeodon : () => netscheri<siberu<foina, pallidus>, luctuosa>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -1144,9 +1144,9 @@ module julianae {
 >luctuosa : luctuosa
 >x : netscheri<siberu<foina, pallidus>, luctuosa>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -1173,22 +1173,22 @@ module julianae {
     datae() : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >datae : () => arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >x : arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
@@ -1225,14 +1225,14 @@ module julianae {
     kihaulei() : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis> { var x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >kihaulei : () => amphibius<oconnelli, konganensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : amphibius<oconnelli, konganensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >macrorhinos : macrorhinos
@@ -1257,14 +1257,14 @@ module julianae {
     olchonensis() : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca> { var x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >olchonensis : () => crenulata<falconeri, melanoleuca>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : crenulata<falconeri, melanoleuca>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >provocax : provocax
@@ -1282,14 +1282,14 @@ module julianae {
     Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
 >Californium : () => setulosus<punicus, melanops>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >dammermani : dammermani
 >melanops : melanops
 >x : setulosus<punicus, melanops>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >dammermani : dammermani
@@ -1302,14 +1302,14 @@ module julianae {
     Flerovium() : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus> { var x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >Flerovium : () => angulatus<minutilla, xanthognathus>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : angulatus<minutilla, xanthognathus>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >lavali : lavali
@@ -1355,9 +1355,9 @@ module ruatanica {
     eurycerus() : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni> { var x : panamensis.linulus<ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >eurycerus : () => linulus<Praseodymium<jugularis, melanops>, wilsoni>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >dammermani : dammermani
@@ -1366,9 +1366,9 @@ module ruatanica {
 >wilsoni : wilsoni
 >x : linulus<Praseodymium<jugularis, melanops>, wilsoni>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >dammermani : dammermani
@@ -1430,7 +1430,7 @@ module Lanthanum {
 >T0 : T0
 >T1 : T1
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >lutreolus : lutreolus
@@ -1451,14 +1451,14 @@ module Lanthanum {
     negligens() : minutus.inez<lavali.wilsoni, lavali.wilsoni> { var x : minutus.inez<lavali.wilsoni, lavali.wilsoni>; () => { var y = this; }; return x; }
 >negligens : () => inez<wilsoni, wilsoni>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lavali : lavali
 >wilsoni : wilsoni
 >x : inez<wilsoni, wilsoni>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lavali : lavali
@@ -1471,14 +1471,14 @@ module Lanthanum {
     lewisi() : julianae.oralis<lavali.xanthognathus, argurus.oreas> { var x : julianae.oralis<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
 >lewisi : () => oralis<xanthognathus, oreas>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : oralis<xanthognathus, oreas>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -1491,14 +1491,14 @@ module Lanthanum {
     arge() : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus> { var x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >arge : () => sarasinorum<megaphyllus, xanthognathus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : sarasinorum<megaphyllus, xanthognathus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -1535,14 +1535,14 @@ module Lanthanum {
     tonganus() : argurus.netscheri<dogramacii.aurata, dogramacii.aurata> { var x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>; () => { var y = this; }; return x; }
 >tonganus : () => netscheri<aurata, aurata>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dogramacii : dogramacii
 >aurata : aurata
 >x : netscheri<aurata, aurata>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dogramacii : dogramacii
@@ -1555,14 +1555,14 @@ module Lanthanum {
     silvatica() : rendalli.moojeni<dogramacii.aurata, lavali.otion> { var x : rendalli.moojeni<dogramacii.aurata, lavali.otion>; () => { var y = this; }; return x; }
 >silvatica : () => moojeni<aurata, otion>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >lavali : lavali
 >otion : otion
 >x : moojeni<aurata, otion>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >lavali : lavali
@@ -1599,7 +1599,7 @@ module Lanthanum {
   export class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
 >megalonyx : megalonyx
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >julianae : julianae
@@ -1620,14 +1620,14 @@ module Lanthanum {
     melanogaster() : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis> { var x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >melanogaster : () => veraecrucis<falconeri, carolinensis>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : veraecrucis<falconeri, carolinensis>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
@@ -1639,13 +1639,13 @@ module Lanthanum {
 
     elaphus() : nitidus<petrophilus.minutilla, julianae.sumatrana> { var x : nitidus<petrophilus.minutilla, julianae.sumatrana>; () => { var y = this; }; return x; }
 >elaphus : () => nitidus<minutilla, sumatrana>
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
 >sumatrana : sumatrana
 >x : nitidus<minutilla, sumatrana>
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
@@ -1682,22 +1682,22 @@ module Lanthanum {
     caraccioli() : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>> { var x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>; () => { var y = this; }; return x; }
 >caraccioli : () => ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >julianae : julianae
 >acariensis : acariensis
 >x : ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >julianae : julianae
@@ -1722,13 +1722,13 @@ module Lanthanum {
     albipes() : quasiater.wattsi<dammermani.melanops, megalonyx> { var x : quasiater.wattsi<dammermani.melanops, megalonyx>; () => { var y = this; }; return x; }
 >albipes : () => wattsi<melanops, megalonyx>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >megalonyx : megalonyx
 >x : wattsi<melanops, megalonyx>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >megalonyx : megalonyx
@@ -1743,14 +1743,14 @@ module Lanthanum {
     torrei() : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon> { var x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >torrei : () => sodyi<oreas, daphaenodon>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : sodyi<oreas, daphaenodon>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
@@ -1798,13 +1798,13 @@ module Lanthanum {
 
     talpinus() : nitidus<ruatanica.americanus, sagitta.stolzmanni> { var x : nitidus<ruatanica.americanus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >talpinus : () => nitidus<americanus, stolzmanni>
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : nitidus<americanus, stolzmanni>
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >sagitta : sagitta
@@ -1829,14 +1829,14 @@ module Lanthanum {
     dartmouthi() : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
 >dartmouthi : () => mixtus<daphaenodon, luctuosa>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >argurus : argurus
 >luctuosa : luctuosa
 >x : mixtus<daphaenodon, luctuosa>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >argurus : argurus
@@ -1849,14 +1849,14 @@ module Lanthanum {
     ogilbyi() : argurus.dauricus<argurus.oreas, quasiater.carolinensis> { var x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >ogilbyi : () => dauricus<oreas, carolinensis>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : dauricus<oreas, carolinensis>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >quasiater : quasiater
@@ -1869,14 +1869,14 @@ module Lanthanum {
     incomtus() : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis> { var x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >incomtus : () => nesiotes<sumatrana, carolinensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : nesiotes<sumatrana, carolinensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >quasiater : quasiater
@@ -1889,14 +1889,14 @@ module Lanthanum {
     surdaster() : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus> { var x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >surdaster : () => Praseodymium<germaini, megaphyllus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >x : Praseodymium<germaini, megaphyllus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >caurinus : caurinus
@@ -1909,14 +1909,14 @@ module Lanthanum {
     melanorhinus() : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis> { var x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >melanorhinus : () => pelurus<melanops, zuluensis>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >rendalli : rendalli
 >zuluensis : zuluensis
 >x : pelurus<melanops, zuluensis>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >rendalli : rendalli
@@ -1929,9 +1929,9 @@ module Lanthanum {
     picticaudata() : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri> { var x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >picticaudata : () => inez<wattsi<carolinensis, lepturus>, kaiseri>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -1940,9 +1940,9 @@ module Lanthanum {
 >kaiseri : kaiseri
 >x : inez<wattsi<carolinensis, lepturus>, kaiseri>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -1990,14 +1990,14 @@ module rendalli {
     telfairi() : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca> { var x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >telfairi : () => wetmorei<megalonyx, melanoleuca>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : wetmorei<megalonyx, melanoleuca>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >provocax : provocax
@@ -2010,14 +2010,14 @@ module rendalli {
     keyensis() : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus> { var x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>; () => { var y = this; }; return x; }
 >keyensis : () => wattsi<carolinensis, lepturus>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >lepturus : lepturus
 >x : wattsi<carolinensis, lepturus>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -2030,14 +2030,14 @@ module rendalli {
     occasius() : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus> { var x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >occasius : () => gilbertii<psilurus, xanthognathus>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : gilbertii<psilurus, xanthognathus>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >lavali : lavali
@@ -2062,14 +2062,14 @@ module rendalli {
     Neptunium() : panglima.abidi<dogramacii.robustulus, lutreolus.foina> { var x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>; () => { var y = this; }; return x; }
 >Neptunium : () => abidi<robustulus, foina>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >robustulus : robustulus
 >lutreolus : lutreolus
 >foina : foina
 >x : abidi<robustulus, foina>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >robustulus : robustulus
 >lutreolus : lutreolus
@@ -2106,14 +2106,14 @@ module rendalli {
     alborufus() : panamensis.linulus<lavali.lepturus, argurus.oreas> { var x : panamensis.linulus<lavali.lepturus, argurus.oreas>; () => { var y = this; }; return x; }
 >alborufus : () => linulus<lepturus, oreas>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
 >oreas : oreas
 >x : linulus<lepturus, oreas>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
@@ -2138,14 +2138,14 @@ module rendalli {
     gordonorum() : howi.angulatus<ruatanica.americanus, argurus.germaini> { var x : howi.angulatus<ruatanica.americanus, argurus.germaini>; () => { var y = this; }; return x; }
 >gordonorum : () => angulatus<americanus, germaini>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
 >germaini : germaini
 >x : angulatus<americanus, germaini>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
@@ -2158,14 +2158,14 @@ module rendalli {
     ruber() : dammermani.siberu<lutreolus.punicus, julianae.acariensis> { var x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>; () => { var y = this; }; return x; }
 >ruber : () => siberu<punicus, acariensis>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >julianae : julianae
 >acariensis : acariensis
 >x : siberu<punicus, acariensis>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >julianae : julianae
@@ -2190,14 +2190,14 @@ module rendalli {
     lutillus() : nigra.dolichurus<howi.marcanoi, lavali.wilsoni> { var x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
 >lutillus : () => dolichurus<marcanoi, wilsoni>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >lavali : lavali
 >wilsoni : wilsoni
 >x : dolichurus<marcanoi, wilsoni>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >lavali : lavali
@@ -2239,14 +2239,14 @@ module rendalli {
     montosa() : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla> { var x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >montosa : () => ciliolabrum<megalonyx, minutilla>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
 >minutilla : minutilla
 >x : ciliolabrum<megalonyx, minutilla>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -2281,22 +2281,22 @@ module rendalli {
     marchei() : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>> { var x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>; () => { var y = this; }; return x; }
 >marchei : () => amphibius<uralensis, klossii<nudicaudus, aurata>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >x : amphibius<uralensis, klossii<nudicaudus, aurata>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
@@ -2321,11 +2321,11 @@ module rendalli {
     maggietaylorae() : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni> { var x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >maggietaylorae : () => mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
@@ -2336,11 +2336,11 @@ module rendalli {
 >stolzmanni : stolzmanni
 >x : mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
@@ -2357,14 +2357,14 @@ module rendalli {
     poliocephalus() : julianae.gerbillus<julianae.durangae, dammermani.melanops> { var x : julianae.gerbillus<julianae.durangae, dammermani.melanops>; () => { var y = this; }; return x; }
 >poliocephalus : () => gerbillus<durangae, melanops>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >julianae : julianae
 >durangae : durangae
 >dammermani : dammermani
 >melanops : melanops
 >x : gerbillus<durangae, melanops>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >julianae : julianae
 >durangae : durangae
 >dammermani : dammermani
@@ -2377,14 +2377,14 @@ module rendalli {
     zibethicus() : minutus.inez<sagitta.stolzmanni, dammermani.melanops> { var x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>; () => { var y = this; }; return x; }
 >zibethicus : () => inez<stolzmanni, melanops>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
 >melanops : melanops
 >x : inez<stolzmanni, melanops>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -2397,14 +2397,14 @@ module rendalli {
     biacensis() : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca> { var x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >biacensis : () => coludo<bobrinskoi, melanoleuca>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : coludo<bobrinskoi, melanoleuca>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >provocax : provocax
@@ -2424,14 +2424,14 @@ module rendalli {
     salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >salvanius : () => coludo<marcanoi, caniventer>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : coludo<marcanoi, caniventer>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >rionegrensis : rionegrensis
@@ -2456,13 +2456,13 @@ module rendalli {
     edax() : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer> { var x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >edax : () => cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -2471,13 +2471,13 @@ module rendalli {
 >caniventer : caniventer
 >x : cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -2559,14 +2559,14 @@ module trivirgatus {
     cervinipes() : panglima.abidi<lavali.lepturus, caurinus.psilurus> { var x : panglima.abidi<lavali.lepturus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >cervinipes : () => abidi<lepturus, psilurus>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
 >psilurus : psilurus
 >x : abidi<lepturus, psilurus>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
@@ -2591,14 +2591,14 @@ module trivirgatus {
     vallinus() : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus> { var x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>; () => { var y = this; }; return x; }
 >vallinus : () => sicarius<wilsoni, punicus>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lutreolus : lutreolus
 >punicus : punicus
 >x : sicarius<wilsoni, punicus>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lutreolus : lutreolus
@@ -2613,11 +2613,11 @@ module trivirgatus {
 >T0 : T0
 >T1 : T1
 >argurus : argurus
->pygmaea : pygmaea
+>pygmaea : pygmaea<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
@@ -2638,30 +2638,30 @@ module trivirgatus {
     bryophilus() : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>> { var x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>; () => { var y = this; }; return x; }
 >bryophilus : () => marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -2686,22 +2686,22 @@ module trivirgatus {
     crawfordi() : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>> { var x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >crawfordi : () => coludo<steerii, gerbillus<thaeleri, carolinensis>>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : coludo<steerii, gerbillus<thaeleri, carolinensis>>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
@@ -2726,10 +2726,10 @@ module trivirgatus {
     matacus() : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> { var x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>; () => { var y = this; }; return x; }
 >matacus : () => fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus
->lotor : lotor
+>linulus : linulus<T0, T1>
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -2740,10 +2740,10 @@ module trivirgatus {
 >melanops : melanops
 >x : fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus
->lotor : lotor
+>linulus : linulus<T0, T1>
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -2760,14 +2760,14 @@ module trivirgatus {
     demidoff() : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis> { var x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >demidoff : () => johorensis<acariensis, zuluensis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >rendalli : rendalli
 >zuluensis : zuluensis
 >x : johorensis<acariensis, zuluensis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >rendalli : rendalli
@@ -2797,14 +2797,14 @@ module trivirgatus {
     pullata() : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae> { var x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>; () => { var y = this; }; return x; }
 >pullata : () => veraecrucis<carolinensis, peninsulae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >argurus : argurus
 >peninsulae : peninsulae
 >x : veraecrucis<carolinensis, peninsulae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >argurus : argurus
@@ -2820,38 +2820,38 @@ module trivirgatus {
     cabrali() : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>> { var x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>; () => { var y = this; }; return x; }
 >cabrali : () => moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
 >minutilla : minutilla
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
 >steerii : steerii
 >x : moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
 >minutilla : minutilla
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
@@ -2864,13 +2864,13 @@ module trivirgatus {
     gouldi() : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis> { var x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>; () => { var y = this; }; return x; }
 >gouldi : () => dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -2879,13 +2879,13 @@ module trivirgatus {
 >uralensis : uralensis
 >x : dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -2900,22 +2900,22 @@ module trivirgatus {
     fuscicollis() : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>> { var x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >fuscicollis : () => pelurus<melanops, nitidus<americanus, stolzmanni>>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : pelurus<melanops, nitidus<americanus, stolzmanni>>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >sagitta : sagitta
@@ -2928,13 +2928,13 @@ module trivirgatus {
     martiensseni() : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae> { var x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >martiensseni : () => cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >lavali : lavali
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
@@ -2943,13 +2943,13 @@ module trivirgatus {
 >koepckeae : koepckeae
 >x : cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >lavali : lavali
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
@@ -2976,22 +2976,22 @@ module trivirgatus {
     shawi() : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>> { var x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>; () => { var y = this; }; return x; }
 >shawi : () => inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >x : inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >quasiater : quasiater
@@ -3019,14 +3019,14 @@ module trivirgatus {
     youngsoni() : nigra.thalia<patas.uralensis, julianae.galapagoensis> { var x : nigra.thalia<patas.uralensis, julianae.galapagoensis>; () => { var y = this; }; return x; }
 >youngsoni : () => thalia<uralensis, galapagoensis>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >julianae : julianae
 >galapagoensis : galapagoensis
 >x : thalia<uralensis, galapagoensis>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >julianae : julianae
@@ -3051,22 +3051,22 @@ module trivirgatus {
     chrysopus() : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >chrysopus : () => sicarius<koepckeae, sodyi<oreas, daphaenodon>>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : sicarius<koepckeae, sodyi<oreas, daphaenodon>>
 >sagitta : sagitta
->sicarius : sicarius
+>sicarius : sicarius<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
@@ -3091,30 +3091,30 @@ module trivirgatus {
     hellwaldii() : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>> { var x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >hellwaldii : () => gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >dogramacii : dogramacii
 >robustulus : robustulus
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >dogramacii : dogramacii
 >robustulus : robustulus
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >macrorhinos : macrorhinos
@@ -3163,14 +3163,14 @@ module trivirgatus {
     krebsii() : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae> { var x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>; () => { var y = this; }; return x; }
 >krebsii : () => veraecrucis<caniventer, durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >julianae : julianae
 >durangae : durangae
 >x : veraecrucis<caniventer, durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >julianae : julianae
@@ -3195,22 +3195,22 @@ module trivirgatus {
     molossinus() : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>> { var x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >molossinus : () => nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >quasiater : quasiater
@@ -3266,14 +3266,14 @@ module quasiater {
     crassicaudatus() : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
 >crassicaudatus : () => cahirinus<daphaenodon, luctuosa>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >argurus : argurus
 >luctuosa : luctuosa
 >x : cahirinus<daphaenodon, luctuosa>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >argurus : argurus
@@ -3298,9 +3298,9 @@ module quasiater {
     ansorgei() : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus> { var x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >ansorgei : () => moojeni<amphibius<falconeri, psilurus>, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -3309,9 +3309,9 @@ module quasiater {
 >echinatus : echinatus
 >x : moojeni<amphibius<falconeri, psilurus>, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -3326,14 +3326,14 @@ module quasiater {
     Copper() : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri> { var x : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >Copper : () => netscheri<carolinensis, kaiseri>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >x : netscheri<carolinensis, kaiseri>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
@@ -3350,7 +3350,7 @@ module ruatanica {
   export class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
 >americanus : americanus
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >lutreolus : lutreolus
@@ -3371,14 +3371,14 @@ module ruatanica {
     mystacalis() : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni> { var x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >mystacalis : () => angulatus<carolinensis, stolzmanni>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : angulatus<carolinensis, stolzmanni>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >sagitta : sagitta
@@ -3419,7 +3419,7 @@ module lavali {
   export class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
 >wilsoni : wilsoni
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >Lanthanum : Lanthanum
@@ -3428,13 +3428,13 @@ module lavali {
     setiger() : nigra.thalia<patas.uralensis, wilsoni> { var x : nigra.thalia<patas.uralensis, wilsoni>; () => { var y = this; }; return x; }
 >setiger : () => thalia<uralensis, wilsoni>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >wilsoni : wilsoni
 >x : thalia<uralensis, wilsoni>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >wilsoni : wilsoni
@@ -3470,14 +3470,14 @@ module lavali {
     blossevillii() : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri> { var x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >blossevillii : () => siberu<megalonyx, kaiseri>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >x : siberu<megalonyx, kaiseri>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >dogramacii : dogramacii
@@ -3514,9 +3514,9 @@ module lavali {
     franqueti() : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus> { var x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >franqueti : () => amphibius<klossii<jugularis, jugularis>, subspinosus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
@@ -3525,9 +3525,9 @@ module lavali {
 >subspinosus : subspinosus
 >x : amphibius<klossii<jugularis, jugularis>, subspinosus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
@@ -3554,14 +3554,14 @@ module lavali {
     degelidus() : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus> { var x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >degelidus : () => sarasinorum<jugularis, subspinosus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : sarasinorum<jugularis, subspinosus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -3586,13 +3586,13 @@ module lavali {
     kob() : trivirgatus.lotor<argurus.oreas, beisa> { var x : trivirgatus.lotor<argurus.oreas, beisa>; () => { var y = this; }; return x; }
 >kob : () => lotor<oreas, beisa>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >beisa : beisa
 >x : lotor<oreas, beisa>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >beisa : beisa
@@ -3604,14 +3604,14 @@ module lavali {
     csorbai() : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> { var x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>; () => { var y = this; }; return x; }
 >csorbai : () => johorensis<megaphyllus, steerii>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >julianae : julianae
 >steerii : steerii
 >x : johorensis<megaphyllus, steerii>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >julianae : julianae
@@ -3639,7 +3639,7 @@ module lavali {
   export class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
 >otion : otion
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -3660,14 +3660,14 @@ module lavali {
     dussumieri() : nigra.gracilis<julianae.steerii, dogramacii.kaiseri> { var x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >dussumieri : () => gracilis<steerii, kaiseri>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >x : gracilis<steerii, kaiseri>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >dogramacii : dogramacii
@@ -3680,14 +3680,14 @@ module lavali {
     osvaldoreigi() : julianae.albidens<julianae.steerii, quasiater.carolinensis> { var x : julianae.albidens<julianae.steerii, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >osvaldoreigi : () => albidens<steerii, carolinensis>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : albidens<steerii, carolinensis>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >quasiater : quasiater
@@ -3734,13 +3734,13 @@ module lavali {
     darlingtoni() : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli> { var x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >darlingtoni : () => leptoceros<wilsoni, oconnelli>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >wilsoni : wilsoni
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : leptoceros<wilsoni, oconnelli>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >wilsoni : wilsoni
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
@@ -3752,12 +3752,12 @@ module lavali {
     fontanierii() : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina> { var x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>; () => { var y = this; }; return x; }
 >fontanierii : () => setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -3766,12 +3766,12 @@ module lavali {
 >foina : foina
 >x : setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -3798,14 +3798,14 @@ module lavali {
     chiriquinus() : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> { var x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >chiriquinus : () => lasiurus<psilurus, psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >caurinus : caurinus
 >psilurus : psilurus
 >x : lasiurus<psilurus, psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >caurinus : caurinus
@@ -3830,14 +3830,14 @@ module lavali {
     ilaeus() : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana> { var x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>; () => { var y = this; }; return x; }
 >ilaeus : () => mahaganus<acariensis, sumatrana>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >julianae : julianae
 >sumatrana : sumatrana
 >x : mahaganus<acariensis, sumatrana>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >julianae : julianae
@@ -3865,14 +3865,14 @@ module lavali {
     nanulus() : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus> { var x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>; () => { var y = this; }; return x; }
 >nanulus : () => nigricans<subspinosus, pallidus>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >samarensis : samarensis
 >pallidus : pallidus
 >x : nigricans<subspinosus, pallidus>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >samarensis : samarensis
@@ -3885,14 +3885,14 @@ module lavali {
     albigena() : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi> { var x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >albigena : () => sarasinorum<psilurus, bobrinskoi>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >x : sarasinorum<psilurus, bobrinskoi>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >quasiater : quasiater
@@ -3917,28 +3917,28 @@ module lavali {
     gunnii() : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>> { var x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
 >gunnii : () => himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>
 >minutus : minutus
->himalayana : himalayana
+>himalayana : himalayana<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lepturus : lepturus
 >lutreolus : lutreolus
 >punicus : punicus
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>
 >minutus : minutus
->himalayana : himalayana
+>himalayana : himalayana<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lepturus : lepturus
 >lutreolus : lutreolus
 >punicus : punicus
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >dogramacii : dogramacii
@@ -3963,13 +3963,13 @@ module lavali {
     variegates() : gabriellae.klossii<wilsoni, julianae.nudicaudus> { var x : gabriellae.klossii<wilsoni, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >variegates : () => klossii<wilsoni, nudicaudus>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >wilsoni : wilsoni
 >julianae : julianae
 >nudicaudus : nudicaudus
 >x : klossii<wilsoni, nudicaudus>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >wilsoni : wilsoni
 >julianae : julianae
 >nudicaudus : nudicaudus
@@ -4005,12 +4005,12 @@ module lavali {
     ineptus() : panamensis.setulosus<xanthognathus, beisa> { var x : panamensis.setulosus<xanthognathus, beisa>; () => { var y = this; }; return x; }
 >ineptus : () => setulosus<xanthognathus, beisa>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
 >x : setulosus<xanthognathus, beisa>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
 >() => { var y = this; } : () => void
@@ -4021,22 +4021,22 @@ module lavali {
     euryotis() : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>> { var x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>; () => { var y = this; }; return x; }
 >euryotis : () => moojeni<steerii, pelurus<jugularis, americanus>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
 >americanus : americanus
 >x : moojeni<steerii, pelurus<jugularis, americanus>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
@@ -4049,14 +4049,14 @@ module lavali {
     maurisca() : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus> { var x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >maurisca : () => suillus<caniventer, subspinosus>
 >Lanthanum : Lanthanum
->suillus : suillus
+>suillus : suillus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : suillus<caniventer, subspinosus>
 >Lanthanum : Lanthanum
->suillus : suillus
+>suillus : suillus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >imperfecta : imperfecta
@@ -4069,17 +4069,17 @@ module lavali {
     coyhaiquensis() : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus> { var x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>; () => { var y = this; }; return x; }
 >coyhaiquensis : () => mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
 >sumatrana : sumatrana
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
@@ -4088,17 +4088,17 @@ module lavali {
 >punicus : punicus
 >x : mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
 >sumatrana : sumatrana
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
@@ -4130,14 +4130,14 @@ module lavali {
     parvipes() : nigra.dolichurus<argurus.germaini, samarensis.pallidus> { var x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>; () => { var y = this; }; return x; }
 >parvipes : () => dolichurus<germaini, pallidus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >samarensis : samarensis
 >pallidus : pallidus
 >x : dolichurus<germaini, pallidus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >samarensis : samarensis
@@ -4150,9 +4150,9 @@ module lavali {
     sponsorius() : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii> { var x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>; () => { var y = this; }; return x; }
 >sponsorius : () => veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >quasiater : quasiater
@@ -4161,9 +4161,9 @@ module lavali {
 >steerii : steerii
 >x : veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >quasiater : quasiater
@@ -4202,13 +4202,13 @@ module lavali {
     rubicola() : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>> { var x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>; () => { var y = this; }; return x; }
 >rubicola : () => moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -4217,13 +4217,13 @@ module lavali {
 >echinatus : echinatus
 >x : moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -4250,20 +4250,20 @@ module lavali {
     paramicrus() : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
 >paramicrus : () => ciliolabrum<otion, sodyi<konganensis, psilurus>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
 >psilurus : psilurus
 >x : ciliolabrum<otion, sodyi<konganensis, psilurus>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
@@ -4276,7 +4276,7 @@ module lavali {
   export class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
 >lepturus : lepturus
 >Lanthanum : Lanthanum
->suillus : suillus
+>suillus : suillus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >quasiater : quasiater
@@ -4285,14 +4285,14 @@ module lavali {
     ferrumequinum() : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus> { var x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >ferrumequinum : () => netscheri<luctuosa, nudicaudus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
 >nudicaudus : nudicaudus
 >x : netscheri<luctuosa, nudicaudus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
@@ -4305,15 +4305,15 @@ module lavali {
     aequalis() : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis> { var x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >aequalis : () => cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
@@ -4323,15 +4323,15 @@ module lavali {
 >jugularis : jugularis
 >x : cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
@@ -4356,14 +4356,14 @@ module dogramacii {
     fossor() : minutus.inez<argurus.peninsulae, julianae.nudicaudus> { var x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>; () => { var y = this; }; return x; }
 >fossor : () => inez<peninsulae, nudicaudus>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >x : inez<peninsulae, nudicaudus>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
@@ -4376,14 +4376,14 @@ module dogramacii {
     humboldti() : sagitta.cinereus<lavali.xanthognathus, argurus.oreas> { var x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
 >humboldti : () => cinereus<xanthognathus, oreas>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : cinereus<xanthognathus, oreas>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -4408,14 +4408,14 @@ module dogramacii {
     martini() : julianae.oralis<julianae.steerii, lavali.lepturus> { var x : julianae.oralis<julianae.steerii, lavali.lepturus>; () => { var y = this; }; return x; }
 >martini : () => oralis<steerii, lepturus>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
 >lepturus : lepturus
 >x : oralis<steerii, lepturus>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -4464,14 +4464,14 @@ module dogramacii {
     keaysi() : howi.angulatus<lavali.beisa, rendalli.zuluensis> { var x : howi.angulatus<lavali.beisa, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >keaysi : () => angulatus<beisa, zuluensis>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >rendalli : rendalli
 >zuluensis : zuluensis
 >x : angulatus<beisa, zuluensis>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >rendalli : rendalli
@@ -4484,14 +4484,14 @@ module dogramacii {
     hindei() : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii> { var x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>; () => { var y = this; }; return x; }
 >hindei : () => lasiurus<konganensis, steerii>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >julianae : julianae
 >steerii : steerii
 >x : lasiurus<konganensis, steerii>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >julianae : julianae
@@ -4507,9 +4507,9 @@ module dogramacii {
     culturatus() : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana> { var x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>; () => { var y = this; }; return x; }
 >culturatus : () => pelurus<arboreus<kaiseri, punicus>, sumatrana>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
@@ -4517,9 +4517,9 @@ module dogramacii {
 >sumatrana : sumatrana
 >x : pelurus<arboreus<kaiseri, punicus>, sumatrana>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
@@ -4560,14 +4560,14 @@ module dogramacii {
     rubidus() : trivirgatus.lotor<julianae.steerii, samarensis.pallidus> { var x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>; () => { var y = this; }; return x; }
 >rubidus : () => lotor<steerii, pallidus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
 >pallidus : pallidus
 >x : lotor<steerii, pallidus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
@@ -4592,30 +4592,30 @@ module dogramacii {
     marginata() : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
 >marginata : () => wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -4628,22 +4628,22 @@ module dogramacii {
     Meitnerium() : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>> { var x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
 >Meitnerium : () => Praseodymium<sumatrana, cor<jugularis, galapagoensis>>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
 >galapagoensis : galapagoensis
 >x : Praseodymium<sumatrana, cor<jugularis, galapagoensis>>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >lutreolus : lutreolus
->cor : cor
+>cor : cor<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
@@ -4668,14 +4668,14 @@ module dogramacii {
     hoolock() : samarensis.pelurus<argurus.oreas, argurus.luctuosa> { var x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>; () => { var y = this; }; return x; }
 >hoolock : () => pelurus<oreas, luctuosa>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >argurus : argurus
 >luctuosa : luctuosa
 >x : pelurus<oreas, luctuosa>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >argurus : argurus
@@ -4751,11 +4751,11 @@ module dogramacii {
     grunniens() : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus> { var x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>; () => { var y = this; }; return x; }
 >grunniens : () => gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
@@ -4765,11 +4765,11 @@ module dogramacii {
 >americanus : americanus
 >x : gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
@@ -4809,14 +4809,14 @@ module dogramacii {
     mirapitanga() : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus> { var x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >mirapitanga : () => albidens<echinatus, echinatus>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : albidens<echinatus, echinatus>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >gabriellae : gabriellae
@@ -4839,14 +4839,14 @@ module dogramacii {
     landeri() : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus> { var x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
 >landeri : () => pelurus<jugularis, americanus>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
 >americanus : americanus
 >x : pelurus<jugularis, americanus>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
@@ -4859,9 +4859,9 @@ module dogramacii {
     sonomae() : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae> { var x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>; () => { var y = this; }; return x; }
 >sonomae : () => lotor<abidi<lepturus, psilurus>, koepckeae>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
@@ -4869,9 +4869,9 @@ module dogramacii {
 >koepckeae : koepckeae
 >x : lotor<abidi<lepturus, psilurus>, koepckeae>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
@@ -4885,30 +4885,30 @@ module dogramacii {
     erythromos() : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >erythromos : () => johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
 >pallidus : pallidus
 >x : johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -4954,14 +4954,14 @@ module lutreolus {
     culionensis() : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer> { var x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >culionensis : () => dauricus<americanus, caniventer>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : dauricus<americanus, caniventer>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
@@ -4974,14 +4974,14 @@ module lutreolus {
     scrofa() : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana> { var x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>; () => { var y = this; }; return x; }
 >scrofa : () => sodyi<amicus, sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >julianae : julianae
 >sumatrana : sumatrana
 >x : sodyi<amicus, sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >julianae : julianae
@@ -5006,22 +5006,22 @@ module lutreolus {
     Tin() : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>> { var x : sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >Tin : () => leptoceros<punicus, arboreus<carolinensis, caniventer>>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : leptoceros<punicus, arboreus<carolinensis, caniventer>>
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -5034,22 +5034,22 @@ module lutreolus {
     marmorata() : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>> { var x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>>; () => { var y = this; }; return x; }
 >marmorata : () => setulosus<carolinensis, arboreus<kaiseri, punicus>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
 >x : setulosus<carolinensis, arboreus<kaiseri, punicus>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lutreolus : lutreolus
@@ -5062,14 +5062,14 @@ module lutreolus {
     tavaratra() : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon> { var x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >tavaratra : () => nitidus<marcanoi, daphaenodon>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : nitidus<marcanoi, daphaenodon>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >macrorhinos : macrorhinos
@@ -5082,14 +5082,14 @@ module lutreolus {
     peregrina() : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus> { var x : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus>; () => { var y = this; }; return x; }
 >peregrina : () => nesiotes<konganensis, punicus>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >lutreolus : lutreolus
 >punicus : punicus
 >x : nesiotes<konganensis, punicus>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >lutreolus : lutreolus
@@ -5102,13 +5102,13 @@ module lutreolus {
     frontalis() : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus> { var x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>; () => { var y = this; }; return x; }
 >frontalis : () => marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
@@ -5117,13 +5117,13 @@ module lutreolus {
 >pallidus : pallidus
 >x : marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
@@ -5150,22 +5150,22 @@ module lutreolus {
     magdalenae() : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>> { var x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>; () => { var y = this; }; return x; }
 >magdalenae : () => gerbillus<caniventer, crenulata<zuluensis, robustulus>>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : gerbillus<caniventer, crenulata<zuluensis, robustulus>>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >dogramacii : dogramacii
@@ -5178,14 +5178,14 @@ module lutreolus {
     andamanensis() : julianae.oralis<ruatanica.americanus, rendalli.zuluensis> { var x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>; () => { var y = this; }; return x; }
 >andamanensis : () => oralis<americanus, zuluensis>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rendalli : rendalli
 >zuluensis : zuluensis
 >x : oralis<americanus, zuluensis>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rendalli : rendalli
@@ -5198,14 +5198,14 @@ module lutreolus {
     dispar() : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis> { var x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>; () => { var y = this; }; return x; }
 >dispar : () => linulus<kaiseri, portoricensis>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
 >portoricensis : portoricensis
 >x : linulus<kaiseri, portoricensis>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
@@ -5251,14 +5251,14 @@ module argurus {
     foxi() : daubentonii.nesiotes<lavali.beisa, lavali.lepturus> { var x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>; () => { var y = this; }; return x; }
 >foxi : () => nesiotes<beisa, lepturus>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >lavali : lavali
 >lepturus : lepturus
 >x : nesiotes<beisa, lepturus>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >lavali : lavali
@@ -5271,13 +5271,13 @@ module argurus {
     macleayii() : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla> { var x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>; () => { var y = this; }; return x; }
 >macleayii : () => sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -5286,13 +5286,13 @@ module argurus {
 >minutilla : minutilla
 >x : sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -5331,14 +5331,14 @@ module argurus {
     albifrons() : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae> { var x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>; () => { var y = this; }; return x; }
 >albifrons : () => veraecrucis<lepturus, durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
 >durangae : durangae
 >x : veraecrucis<lepturus, durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
@@ -5351,30 +5351,30 @@ module argurus {
     jacobitus() : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>> { var x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>>; () => { var y = this; }; return x; }
 >jacobitus : () => johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
@@ -5387,14 +5387,14 @@ module argurus {
     guentheri() : rendalli.moojeni<lutreolus.foina, argurus.oreas> { var x : rendalli.moojeni<lutreolus.foina, argurus.oreas>; () => { var y = this; }; return x; }
 >guentheri : () => moojeni<foina, oreas>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
 >oreas : oreas
 >x : moojeni<foina, oreas>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
@@ -5407,14 +5407,14 @@ module argurus {
     mahomet() : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> { var x : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina>; () => { var y = this; }; return x; }
 >mahomet : () => ciliolabrum<germaini, foina>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >lutreolus : lutreolus
 >foina : foina
 >x : ciliolabrum<germaini, foina>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >lutreolus : lutreolus
@@ -5427,9 +5427,9 @@ module argurus {
     misionensis() : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus> { var x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >misionensis : () => marmosurus<arboreus<carolinensis, caniventer>, echinatus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -5438,9 +5438,9 @@ module argurus {
 >echinatus : echinatus
 >x : marmosurus<arboreus<carolinensis, caniventer>, echinatus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -5464,54 +5464,54 @@ module nigra {
     solomonis() : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>> { var x : panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>; () => { var y = this; }; return x; }
 >solomonis : () => abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -5536,46 +5536,46 @@ module nigra {
     morrisi() : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>> { var x : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>; () => { var y = this; }; return x; }
 >morrisi : () => hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -5588,14 +5588,14 @@ module nigra {
     lekaguli() : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus> { var x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>; () => { var y = this; }; return x; }
 >lekaguli : () => nitidus<melanops, lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >lavali : lavali
 >lepturus : lepturus
 >x : nitidus<melanops, lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >lavali : lavali
@@ -5662,9 +5662,9 @@ module panglima {
 >T0 : T0
 >T1 : T1
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
@@ -5675,10 +5675,10 @@ module panglima {
         bottegi(): macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >bottegi : () => marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
->amphibius : amphibius
+>moojeni : moojeni<T0, T1>
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -5689,10 +5689,10 @@ module panglima {
 >stolzmanni : stolzmanni
 >x : marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
->amphibius : amphibius
+>moojeni : moojeni<T0, T1>
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -5733,14 +5733,14 @@ module panglima {
         spadix(): petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus> { var x: petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>; () => { var y = this; }; return x; }
 >spadix : () => sodyi<konganensis, psilurus>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
 >psilurus : psilurus
 >x : sodyi<konganensis, psilurus>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
@@ -5753,14 +5753,14 @@ module panglima {
         luismanueli(): rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli> { var x: rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >luismanueli : () => moojeni<sumatrana, oconnelli>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : moojeni<sumatrana, oconnelli>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
@@ -5773,14 +5773,14 @@ module panglima {
         aceramarcae(): daubentonii.arboreus<julianae.nudicaudus, julianae.steerii> { var x: daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>; () => { var y = this; }; return x; }
 >aceramarcae : () => arboreus<nudicaudus, steerii>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
 >steerii : steerii
 >x : arboreus<nudicaudus, steerii>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
@@ -5800,14 +5800,14 @@ module panglima {
         crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca> { var x: nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >crassulus : () => gracilis<melanoleuca, melanoleuca>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : gracilis<melanoleuca, melanoleuca>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >provocax : provocax
@@ -5820,44 +5820,44 @@ module panglima {
         flamarioni(): imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>> { var x: imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>; () => { var y = this; }; return x; }
 >flamarioni : () => lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
->amphibius : amphibius
+>lasiurus : lasiurus<T0, T1>
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
->amphibius : amphibius
+>lasiurus : lasiurus<T0, T1>
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -5870,9 +5870,9 @@ module panglima {
         mirabilis(): macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus> { var x: macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
 >mirabilis : () => marmosurus<rosalia<steerii, beisa>, lepturus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -5881,9 +5881,9 @@ module panglima {
 >lepturus : lepturus
 >x : marmosurus<rosalia<steerii, beisa>, lepturus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -5900,7 +5900,7 @@ module panglima {
 >T0 : T0
 >T1 : T1
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
@@ -5933,14 +5933,14 @@ module panglima {
         galili(): samarensis.cahirinus<dammermani.melanops, samarensis.pallidus> { var x: samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>; () => { var y = this; }; return x; }
 >galili : () => cahirinus<melanops, pallidus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >samarensis : samarensis
 >pallidus : pallidus
 >x : cahirinus<melanops, pallidus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >samarensis : samarensis
@@ -5965,22 +5965,22 @@ module panglima {
         ega(): imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> { var x: imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>; () => { var y = this; }; return x; }
 >ega : () => lasiurus<acariensis, coludo<oreas, marcanoi>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
 >marcanoi : marcanoi
 >x : lasiurus<acariensis, coludo<oreas, marcanoi>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -6024,9 +6024,9 @@ module quasiater {
         aloysiisabaudiae(): argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus> { var x: argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>; () => { var y = this; }; return x; }
 >aloysiisabaudiae : () => netscheri<lotor<oreas, beisa>, lepturus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >lavali : lavali
@@ -6035,9 +6035,9 @@ module quasiater {
 >lepturus : lepturus
 >x : netscheri<lotor<oreas, beisa>, lepturus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >lavali : lavali
@@ -6076,14 +6076,14 @@ module quasiater {
         persephone(): panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni> { var x: panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >persephone : () => fundatus<pallidus, stolzmanni>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : fundatus<pallidus, stolzmanni>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >sagitta : sagitta
@@ -6119,22 +6119,22 @@ module minutus {
         simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>> { var x: argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >simoni : () => netscheri<lepturus, dauricus<oreas, carolinensis>>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : netscheri<lepturus, dauricus<oreas, carolinensis>>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >quasiater : quasiater
@@ -6171,14 +6171,14 @@ module minutus {
         latona(): daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx> { var x: daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>; () => { var y = this; }; return x; }
 >latona : () => nesiotes<melanops, megalonyx>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >x : nesiotes<melanops, megalonyx>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >Lanthanum : Lanthanum
@@ -6203,22 +6203,22 @@ module minutus {
         flaviceps(): minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: minutus.inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
 >flaviceps : () => inez<oreas, fundatus<amicus, foina>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
 >foina : foina
 >x : inez<oreas, fundatus<amicus, foina>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -6231,22 +6231,22 @@ module minutus {
         paradoxolophus(): nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>> { var x: nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >paradoxolophus : () => dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -6271,14 +6271,14 @@ module minutus {
         vulgaris(): Lanthanum.nitidus<lavali.lepturus, julianae.acariensis> { var x: Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>; () => { var y = this; }; return x; }
 >vulgaris : () => nitidus<lepturus, acariensis>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
 >acariensis : acariensis
 >x : nitidus<lepturus, acariensis>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
@@ -6291,14 +6291,14 @@ module minutus {
         betsileoensis(): panglima.amphibius<caurinus.megaphyllus, lavali.lepturus> { var x: panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>; () => { var y = this; }; return x; }
 >betsileoensis : () => amphibius<megaphyllus, lepturus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
 >lepturus : lepturus
 >x : amphibius<megaphyllus, lepturus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -6311,9 +6311,9 @@ module minutus {
         vespuccii(): argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca> { var x: argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >vespuccii : () => gilbertii<klossii<konganensis, carolinensis>, melanoleuca>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >quasiater : quasiater
@@ -6322,9 +6322,9 @@ module minutus {
 >melanoleuca : melanoleuca
 >x : gilbertii<klossii<konganensis, carolinensis>, melanoleuca>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >quasiater : quasiater
@@ -6357,7 +6357,7 @@ module caurinus {
 >T0 : T0
 >T1 : T1
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
@@ -6366,30 +6366,30 @@ module caurinus {
         martiniquensis(): ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>> { var x: ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<julianae.nudicaudus, lavali.otion>>>; () => { var y = this; }; return x; }
 >martiniquensis : () => hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >lavali : lavali
 >otion : otion
 >x : hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >lavali : lavali
@@ -6402,13 +6402,13 @@ module caurinus {
         devius(): samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>> { var x: samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>; () => { var y = this; }; return x; }
 >devius : () => pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -6417,13 +6417,13 @@ module caurinus {
 >falconeri : falconeri
 >x : pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -6450,14 +6450,14 @@ module caurinus {
         kathleenae(): nigra.dolichurus<patas.uralensis, caurinus.psilurus> { var x: nigra.dolichurus<patas.uralensis, caurinus.psilurus>; () => { var y = this; }; return x; }
 >kathleenae : () => dolichurus<uralensis, psilurus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >caurinus : caurinus
 >psilurus : psilurus
 >x : dolichurus<uralensis, psilurus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >caurinus : caurinus
@@ -6482,30 +6482,30 @@ module caurinus {
         nigrovittatus(): caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>> { var x: caurinus.mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>; () => { var y = this; }; return x; }
 >nigrovittatus : () => mahaganus<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
 >wilsoni : wilsoni
 >x : mahaganus<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
@@ -6518,9 +6518,9 @@ module caurinus {
         senegalensis(): gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops> { var x: gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>; () => { var y = this; }; return x; }
 >senegalensis : () => klossii<coludo<lepturus, punicus>, melanops>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lutreolus : lutreolus
@@ -6529,9 +6529,9 @@ module caurinus {
 >melanops : melanops
 >x : klossii<coludo<lepturus, punicus>, melanops>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lutreolus : lutreolus
@@ -6632,9 +6632,9 @@ module nigra {
         arnuxii(): panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa> { var x: panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>; () => { var y = this; }; return x; }
 >arnuxii : () => linulus<lotor<luctuosa, wilsoni>, beisa>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -6643,9 +6643,9 @@ module nigra {
 >beisa : beisa
 >x : linulus<lotor<luctuosa, wilsoni>, beisa>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -6684,22 +6684,22 @@ module nigra {
         tristriatus(): rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>> { var x: rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>; () => { var y = this; }; return x; }
 >tristriatus : () => veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >howi : howi
 >marcanoi : marcanoi
 >x : veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >howi : howi
@@ -6712,38 +6712,38 @@ module nigra {
         lasiura(): panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>> { var x: panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>; () => { var y = this; }; return x; }
 >lasiura : () => abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
 >acariensis : acariensis
 >x : abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >julianae : julianae
@@ -6768,14 +6768,14 @@ module nigra {
         brucei(): chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus> { var x: chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>; () => { var y = this; }; return x; }
 >brucei : () => sarasinorum<steerii, americanus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >ruatanica : ruatanica
 >americanus : americanus
 >x : sarasinorum<steerii, americanus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >ruatanica : ruatanica
@@ -6797,14 +6797,14 @@ module sagitta {
         maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
 >maracajuensis : () => cahirinus<jugularis, americanus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
 >americanus : americanus
 >x : cahirinus<jugularis, americanus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
@@ -6823,7 +6823,7 @@ module minutus {
 >T0 : T0
 >T1 : T1
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
@@ -6832,14 +6832,14 @@ module minutus {
         vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni> { var x: samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>; () => { var y = this; }; return x; }
 >vexillaris : () => cahirinus<lepturus, wilsoni>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lavali : lavali
 >wilsoni : wilsoni
 >x : cahirinus<lepturus, wilsoni>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lavali : lavali
@@ -6856,7 +6856,7 @@ module macrorhinos {
     export class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
 >konganensis : konganensis
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >caurinus : caurinus
@@ -6871,11 +6871,11 @@ module panamensis {
 >T0 : T0
 >T1 : T1
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
@@ -6884,14 +6884,14 @@ module panamensis {
         goslingi(): daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri> { var x: daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >goslingi : () => arboreus<amicus, kaiseri>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >x : arboreus<amicus, kaiseri>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >dogramacii : dogramacii
@@ -6916,9 +6916,9 @@ module panamensis {
         fumosus(): rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa> { var x: rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>; () => { var y = this; }; return x; }
 >fumosus : () => moojeni<netscheri<aurata, aurata>, beisa>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dogramacii : dogramacii
@@ -6927,9 +6927,9 @@ module panamensis {
 >beisa : beisa
 >x : moojeni<netscheri<aurata, aurata>, beisa>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dogramacii : dogramacii
@@ -6956,14 +6956,14 @@ module panamensis {
         lami(): nigra.thalia<patas.uralensis, dogramacii.robustulus> { var x: nigra.thalia<patas.uralensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >lami : () => thalia<uralensis, robustulus>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : thalia<uralensis, robustulus>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >dogramacii : dogramacii
@@ -6988,14 +6988,14 @@ module panamensis {
         nanilla(): dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli> { var x: dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >nanilla : () => siberu<xanthognathus, oconnelli>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : siberu<xanthognathus, oconnelli>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >trivirgatus : trivirgatus
@@ -7008,14 +7008,14 @@ module panamensis {
         enganus(): petrophilus.sodyi<dogramacii.aurata, argurus.oreas> { var x: petrophilus.sodyi<dogramacii.aurata, argurus.oreas>; () => { var y = this; }; return x; }
 >enganus : () => sodyi<aurata, oreas>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
 >oreas : oreas
 >x : sodyi<aurata, oreas>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
@@ -7028,22 +7028,22 @@ module panamensis {
         gomantongensis(): rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>> { var x: rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >gomantongensis : () => veraecrucis<psilurus, inez<zuluensis, caniventer>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : veraecrucis<psilurus, inez<zuluensis, caniventer>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >rionegrensis : rionegrensis
@@ -7065,14 +7065,14 @@ module nigra {
         weddellii(): nigra.dolichurus<dogramacii.aurata, julianae.steerii> { var x: nigra.dolichurus<dogramacii.aurata, julianae.steerii>; () => { var y = this; }; return x; }
 >weddellii : () => dolichurus<aurata, steerii>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >julianae : julianae
 >steerii : steerii
 >x : dolichurus<aurata, steerii>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >julianae : julianae
@@ -7085,9 +7085,9 @@ module nigra {
         echinothrix(): Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas> { var x: Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>; () => { var y = this; }; return x; }
 >echinothrix : () => nitidus<amphibius<megaphyllus, lepturus>, oreas>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -7096,9 +7096,9 @@ module nigra {
 >oreas : oreas
 >x : nitidus<amphibius<megaphyllus, lepturus>, oreas>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -7125,30 +7125,30 @@ module nigra {
         rouxii(): nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>> { var x: nigra.gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, nigra.thalia<patas.uralensis, julianae.galapagoensis>>; () => { var y = this; }; return x; }
 >rouxii : () => gracilis<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >patas : patas
 >uralensis : uralensis
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >julianae : julianae
 >galapagoensis : galapagoensis
 >x : gracilis<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >patas : patas
 >uralensis : uralensis
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >julianae : julianae
@@ -7185,11 +7185,11 @@ module nigra {
         theresa(): macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >theresa : () => marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -7197,18 +7197,18 @@ module nigra {
 >argurus : argurus
 >luctuosa : luctuosa
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
 >pallidus : pallidus
 >x : marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -7216,7 +7216,7 @@ module nigra {
 >argurus : argurus
 >luctuosa : luctuosa
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -7229,9 +7229,9 @@ module nigra {
         melanocarpus(): julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana> { var x: julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>; () => { var y = this; }; return x; }
 >melanocarpus : () => albidens<siberu<foina, pallidus>, sumatrana>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -7240,9 +7240,9 @@ module nigra {
 >sumatrana : sumatrana
 >x : albidens<siberu<foina, pallidus>, sumatrana>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >samarensis : samarensis
@@ -7305,14 +7305,14 @@ module nigra {
         ramirohitra(): panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus> { var x: panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >ramirohitra : () => amphibius<falconeri, echinatus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : amphibius<falconeri, echinatus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >gabriellae : gabriellae
@@ -7336,14 +7336,14 @@ module samarensis {
         Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >Palladium : () => linulus<konganensis, caniventer>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : linulus<konganensis, caniventer>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >rionegrensis : rionegrensis
@@ -7356,30 +7356,30 @@ module samarensis {
         castanea(): argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>> { var x: argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
 >castanea : () => netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -7392,14 +7392,14 @@ module samarensis {
         chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca> { var x: argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >chamek : () => pygmaea<galapagoensis, melanoleuca>
 >argurus : argurus
->pygmaea : pygmaea
+>pygmaea : pygmaea<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : pygmaea<galapagoensis, melanoleuca>
 >argurus : argurus
->pygmaea : pygmaea
+>pygmaea : pygmaea<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >provocax : provocax
@@ -7423,13 +7423,13 @@ module samarensis {
 
         lunatus(): pelurus<Lanthanum.jugularis, sagitta.walkeri> { var x: pelurus<Lanthanum.jugularis, sagitta.walkeri>; () => { var y = this; }; return x; }
 >lunatus : () => pelurus<jugularis, walkeri>
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
 >walkeri : walkeri
 >x : pelurus<jugularis, walkeri>
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
@@ -7466,14 +7466,14 @@ module samarensis {
         eliasi(): petrophilus.rosalia<julianae.steerii, lavali.beisa> { var x: petrophilus.rosalia<julianae.steerii, lavali.beisa>; () => { var y = this; }; return x; }
 >eliasi : () => rosalia<steerii, beisa>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
 >beisa : beisa
 >x : rosalia<steerii, beisa>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -7486,14 +7486,14 @@ module samarensis {
         proditor(): panamensis.setulosus<gabriellae.echinatus, julianae.steerii> { var x: panamensis.setulosus<gabriellae.echinatus, julianae.steerii>; () => { var y = this; }; return x; }
 >proditor : () => setulosus<echinatus, steerii>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >julianae : julianae
 >steerii : steerii
 >x : setulosus<echinatus, steerii>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >julianae : julianae
@@ -7506,22 +7506,22 @@ module samarensis {
         gambianus(): quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>> { var x: quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>; () => { var y = this; }; return x; }
 >gambianus : () => wattsi<galapagoensis, linulus<xanthognathus, konganensis>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : wattsi<galapagoensis, linulus<xanthognathus, konganensis>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -7546,14 +7546,14 @@ module samarensis {
         nusatenggara(): panglima.amphibius<lavali.lepturus, quasiater.carolinensis> { var x: panglima.amphibius<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >nusatenggara : () => amphibius<lepturus, carolinensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : amphibius<lepturus, carolinensis>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
@@ -7566,14 +7566,14 @@ module samarensis {
         olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi> { var x: rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >olitor : () => veraecrucis<xanthognathus, bobrinskoi>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >x : veraecrucis<xanthognathus, bobrinskoi>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >quasiater : quasiater
@@ -7593,14 +7593,14 @@ module samarensis {
         planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
 >planifrons : () => gracilis<nudicaudus, aurata>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >x : gracilis<nudicaudus, aurata>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
@@ -7671,14 +7671,14 @@ module samarensis {
         macrocercus(): panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana> { var x: panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>; () => { var y = this; }; return x; }
 >macrocercus : () => setulosus<koepckeae, sumatrana>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >julianae : julianae
 >sumatrana : sumatrana
 >x : setulosus<koepckeae, sumatrana>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >julianae : julianae
@@ -7703,14 +7703,14 @@ module samarensis {
         suricatta(): daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus> { var x: daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >suricatta : () => nigricans<melanops, subspinosus>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : nigricans<melanops, subspinosus>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
@@ -7747,15 +7747,15 @@ module samarensis {
         imaizumii(): minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis> { var x: minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >imaizumii : () => inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -7770,15 +7770,15 @@ module samarensis {
 >konganensis : konganensis
 >x : inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -7811,22 +7811,22 @@ module samarensis {
         wolfi(): petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>> { var x: petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>; () => { var y = this; }; return x; }
 >wolfi : () => rosalia<megalonyx, abidi<kaiseri, wilsoni>>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
 >wilsoni : wilsoni
 >x : rosalia<megalonyx, abidi<kaiseri, wilsoni>>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
@@ -7866,38 +7866,38 @@ module samarensis {
         glacialis(): sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>> { var x: sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>; () => { var y = this; }; return x; }
 >glacialis : () => cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -7910,14 +7910,14 @@ module samarensis {
         viaria(): chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus> { var x: chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >viaria : () => sarasinorum<xanthognathus, punicus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >lutreolus : lutreolus
 >punicus : punicus
 >x : sarasinorum<xanthognathus, punicus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >lutreolus : lutreolus
@@ -7935,14 +7935,14 @@ module samarensis {
         alashanicus(): nigra.caucasica<ruatanica.americanus, argurus.peninsulae> { var x: nigra.caucasica<ruatanica.americanus, argurus.peninsulae>; () => { var y = this; }; return x; }
 >alashanicus : () => caucasica<americanus, peninsulae>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
 >peninsulae : peninsulae
 >x : caucasica<americanus, peninsulae>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
@@ -7955,22 +7955,22 @@ module samarensis {
         flaviventer(): trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>> { var x: trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>; () => { var y = this; }; return x; }
 >flaviventer : () => tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >argurus : argurus
 >peninsulae : peninsulae
 >x : tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >argurus : argurus
@@ -8007,46 +8007,46 @@ module samarensis {
         saussurei(): rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>> { var x: rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>; () => { var y = this; }; return x; }
 >saussurei : () => crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
 >oreas : oreas
 >x : crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >julianae : julianae
 >nudicaudus : nudicaudus
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >argurus : argurus
@@ -8065,11 +8065,11 @@ module sagitta {
 >T0 : T0
 >T1 : T1
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
@@ -8090,30 +8090,30 @@ module sagitta {
         hoplomyoides(): panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>> { var x: panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
 >hoplomyoides : () => fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >julianae : julianae
 >durangae : durangae
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >julianae : julianae
 >durangae : durangae
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
@@ -8150,14 +8150,14 @@ module sagitta {
         bolami(): trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus> { var x: trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>; () => { var y = this; }; return x; }
 >bolami : () => tumidifrons<schlegeli, americanus>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >ruatanica : ruatanica
 >americanus : americanus
 >x : tumidifrons<schlegeli, americanus>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >ruatanica : ruatanica
@@ -8208,7 +8208,7 @@ module argurus {
 >T0 : T0
 >T1 : T1
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >gabriellae : gabriellae
@@ -8276,14 +8276,14 @@ module chrysaeolus {
         hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli> { var x: nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >hinpoon : () => caucasica<sumatrana, oconnelli>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : caucasica<sumatrana, oconnelli>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >trivirgatus : trivirgatus
@@ -8296,14 +8296,14 @@ module chrysaeolus {
         kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana> { var x: quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>; () => { var y = this; }; return x; }
 >kandti : () => wattsi<jugularis, sumatrana>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
 >sumatrana : sumatrana
 >x : wattsi<jugularis, sumatrana>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
@@ -8340,14 +8340,14 @@ module chrysaeolus {
         Ununoctium(): nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca> { var x: nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >Ununoctium : () => gracilis<xanthognathus, melanoleuca>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : gracilis<xanthognathus, melanoleuca>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >provocax : provocax
@@ -8381,14 +8381,14 @@ module argurus {
         leucoptera(): petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina> { var x: petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>; () => { var y = this; }; return x; }
 >leucoptera : () => rosalia<koepckeae, foina>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >lutreolus : lutreolus
 >foina : foina
 >x : rosalia<koepckeae, foina>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >lutreolus : lutreolus
@@ -8425,14 +8425,14 @@ module argurus {
         cracens(): argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> { var x: argurus.gilbertii<lavali.thaeleri, lutreolus.punicus>; () => { var y = this; }; return x; }
 >cracens : () => gilbertii<thaeleri, punicus>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >lutreolus : lutreolus
 >punicus : punicus
 >x : gilbertii<thaeleri, punicus>
 >argurus : argurus
->gilbertii : gilbertii
+>gilbertii : gilbertii<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >lutreolus : lutreolus
@@ -8445,22 +8445,22 @@ module argurus {
         jamaicensis(): nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>> { var x: nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >jamaicensis : () => thalia<marcanoi, veraecrucis<falconeri, carolinensis>>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : thalia<marcanoi, veraecrucis<falconeri, carolinensis>>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
@@ -8518,14 +8518,14 @@ module argurus {
         paniscus(): ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus> { var x: ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
 >paniscus : () => Praseodymium<psilurus, xanthognathus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : Praseodymium<psilurus, xanthognathus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >caurinus : caurinus
 >psilurus : psilurus
 >lavali : lavali
@@ -8550,14 +8550,14 @@ module argurus {
         papuanus(): panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> { var x: panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
 >papuanus : () => fundatus<carolinensis, daphaenodon>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : fundatus<carolinensis, daphaenodon>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
@@ -8582,14 +8582,14 @@ module argurus {
         nghetinhensis(): gabriellae.klossii<argurus.luctuosa, julianae.steerii> { var x: gabriellae.klossii<argurus.luctuosa, julianae.steerii>; () => { var y = this; }; return x; }
 >nghetinhensis : () => klossii<luctuosa, steerii>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
 >steerii : steerii
 >x : klossii<luctuosa, steerii>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
@@ -8602,14 +8602,14 @@ module argurus {
         barbei(): samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis> { var x: samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >barbei : () => cahirinus<lepturus, carolinensis>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : cahirinus<lepturus, carolinensis>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
@@ -8643,9 +8643,9 @@ module daubentonii {
         capreolus(): rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni> { var x: rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >capreolus : () => crenulata<pelurus<jugularis, americanus>, wilsoni>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
@@ -8654,9 +8654,9 @@ module daubentonii {
 >wilsoni : wilsoni
 >x : crenulata<pelurus<jugularis, americanus>, wilsoni>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
@@ -8671,14 +8671,14 @@ module daubentonii {
         moreni(): panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae> { var x: panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >moreni : () => abidi<galapagoensis, koepckeae>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >x : abidi<galapagoensis, koepckeae>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >dogramacii : dogramacii
@@ -8691,14 +8691,14 @@ module daubentonii {
         hypoleucos(): nigra.gracilis<trivirgatus.falconeri, argurus.germaini> { var x: nigra.gracilis<trivirgatus.falconeri, argurus.germaini>; () => { var y = this; }; return x; }
 >hypoleucos : () => gracilis<falconeri, germaini>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >argurus : argurus
 >germaini : germaini
 >x : gracilis<falconeri, germaini>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >argurus : argurus
@@ -8723,14 +8723,14 @@ module daubentonii {
         pucheranii(): samarensis.fuscus<julianae.durangae, caurinus.megaphyllus> { var x: samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>; () => { var y = this; }; return x; }
 >pucheranii : () => fuscus<durangae, megaphyllus>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >julianae : julianae
 >durangae : durangae
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >x : fuscus<durangae, megaphyllus>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >julianae : julianae
 >durangae : durangae
 >caurinus : caurinus
@@ -8743,14 +8743,14 @@ module daubentonii {
         stella(): julianae.oralis<lutreolus.foina, quasiater.carolinensis> { var x: julianae.oralis<lutreolus.foina, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >stella : () => oralis<foina, carolinensis>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : oralis<foina, carolinensis>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >quasiater : quasiater
@@ -8811,17 +8811,17 @@ module daubentonii {
         cameroni(): petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus> { var x: petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>; () => { var y = this; }; return x; }
 >cameroni : () => rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -8830,17 +8830,17 @@ module daubentonii {
 >psilurus : psilurus
 >x : rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -8874,14 +8874,14 @@ module patas {
         cartilagonodus(): Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> { var x: Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >cartilagonodus : () => nitidus<caniventer, jugularis>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >x : nitidus<caniventer, jugularis>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >Lanthanum : Lanthanum
@@ -8918,9 +8918,9 @@ module patas {
         nigricauda(): caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> { var x: caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >nigricauda : () => johorensis<nitidus<minutilla, sumatrana>, jugularis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
@@ -8929,9 +8929,9 @@ module patas {
 >jugularis : jugularis
 >x : johorensis<nitidus<minutilla, sumatrana>, jugularis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >julianae : julianae
@@ -8946,22 +8946,22 @@ module patas {
         muricauda(): panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>> { var x: panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>; () => { var y = this; }; return x; }
 >muricauda : () => fundatus<foina, siberu<punicus, acariensis>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >julianae : julianae
 >acariensis : acariensis
 >x : fundatus<foina, siberu<punicus, acariensis>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >julianae : julianae
@@ -8986,14 +8986,14 @@ module patas {
         fallax(): ruatanica.hector<lutreolus.punicus, gabriellae.amicus> { var x: ruatanica.hector<lutreolus.punicus, gabriellae.amicus>; () => { var y = this; }; return x; }
 >fallax : () => hector<punicus, amicus>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >gabriellae : gabriellae
 >amicus : amicus
 >x : hector<punicus, amicus>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >gabriellae : gabriellae
@@ -9006,22 +9006,22 @@ module patas {
         attenuata(): macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>> { var x: macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>; () => { var y = this; }; return x; }
 >attenuata : () => marmosurus<americanus, netscheri<carolinensis, kaiseri>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >x : marmosurus<americanus, netscheri<carolinensis, kaiseri>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
@@ -9046,14 +9046,14 @@ module patas {
         neblina(): samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer> { var x: samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >neblina : () => pelurus<daphaenodon, caniventer>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : pelurus<daphaenodon, caniventer>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >rionegrensis : rionegrensis
@@ -9066,14 +9066,14 @@ module patas {
         citellus(): daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer> { var x: daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >citellus : () => arboreus<carolinensis, caniventer>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : arboreus<carolinensis, caniventer>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -9086,14 +9086,14 @@ module patas {
         tanezumi(): imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> { var x: imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >tanezumi : () => lasiurus<robustulus, psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >dogramacii : dogramacii
 >robustulus : robustulus
 >caurinus : caurinus
 >psilurus : psilurus
 >x : lasiurus<robustulus, psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >dogramacii : dogramacii
 >robustulus : robustulus
 >caurinus : caurinus
@@ -9106,14 +9106,14 @@ module patas {
         albiventer(): rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus> { var x: rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >albiventer : () => crenulata<zuluensis, robustulus>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : crenulata<zuluensis, robustulus>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >dogramacii : dogramacii
@@ -9135,9 +9135,9 @@ module provocax {
         Neodymium(): macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina> { var x: macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>; () => { var y = this; }; return x; }
 >Neodymium : () => marmosurus<sodyi<falconeri, bobrinskoi>, foina>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
@@ -9146,9 +9146,9 @@ module provocax {
 >foina : foina
 >x : marmosurus<sodyi<falconeri, bobrinskoi>, foina>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
@@ -9163,14 +9163,14 @@ module provocax {
         baeri(): imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus> { var x: imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>; () => { var y = this; }; return x; }
 >baeri : () => lasiurus<lepturus, americanus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >ruatanica : ruatanica
 >americanus : americanus
 >x : lasiurus<lepturus, americanus>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >ruatanica : ruatanica
@@ -9192,9 +9192,9 @@ module sagitta {
         Chlorine(): samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus> { var x: samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >Chlorine : () => cahirinus<gracilis<luctuosa, subspinosus>, robustulus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
@@ -9203,9 +9203,9 @@ module sagitta {
 >robustulus : robustulus
 >x : cahirinus<gracilis<luctuosa, subspinosus>, robustulus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
@@ -9220,19 +9220,19 @@ module sagitta {
         simulator(): macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>> { var x: macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >simulator : () => marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >lavali : lavali
 >lepturus : lepturus
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -9243,19 +9243,19 @@ module sagitta {
 >stolzmanni : stolzmanni
 >x : marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >lavali : lavali
 >lepturus : lepturus
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -9305,14 +9305,14 @@ module howi {
         leander(): daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis> { var x: daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>; () => { var y = this; }; return x; }
 >leander : () => nesiotes<megalonyx, portoricensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >minutus : minutus
 >portoricensis : portoricensis
 >x : nesiotes<megalonyx, portoricensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >minutus : minutus
@@ -9337,17 +9337,17 @@ module howi {
         beatrix(): imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>> { var x: imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>; () => { var y = this; }; return x; }
 >beatrix : () => ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -9357,24 +9357,24 @@ module howi {
 >dogramacii : dogramacii
 >aurata : aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >beisa : beisa
 >x : ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -9384,7 +9384,7 @@ module howi {
 >dogramacii : dogramacii
 >aurata : aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -9409,38 +9409,38 @@ module howi {
         zerda(): quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>> { var x: quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
 >zerda : () => wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
 >lepturus : lepturus
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
 >lepturus : lepturus
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
@@ -9477,14 +9477,14 @@ module howi {
         jouvenetae(): argurus.dauricus<argurus.germaini, julianae.durangae> { var x: argurus.dauricus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
 >jouvenetae : () => dauricus<germaini, durangae>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
 >durangae : durangae
 >x : dauricus<germaini, durangae>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
@@ -9533,14 +9533,14 @@ module howi {
         hyaena(): julianae.oralis<lavali.beisa, argurus.oreas> { var x: julianae.oralis<lavali.beisa, argurus.oreas>; () => { var y = this; }; return x; }
 >hyaena : () => oralis<beisa, oreas>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >argurus : argurus
 >oreas : oreas
 >x : oralis<beisa, oreas>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >argurus : argurus
@@ -9586,14 +9586,14 @@ module argurus {
         sondaicus(): samarensis.fuscus<argurus.peninsulae, lavali.lepturus> { var x: samarensis.fuscus<argurus.peninsulae, lavali.lepturus>; () => { var y = this; }; return x; }
 >sondaicus : () => fuscus<peninsulae, lepturus>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >lavali : lavali
 >lepturus : lepturus
 >x : fuscus<peninsulae, lepturus>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >lavali : lavali
@@ -9606,14 +9606,14 @@ module argurus {
         auriventer(): petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli> { var x: petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >auriventer : () => rosalia<xanthognathus, oconnelli>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : rosalia<xanthognathus, oconnelli>
 >petrophilus : petrophilus
->rosalia : rosalia
+>rosalia : rosalia<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >trivirgatus : trivirgatus
@@ -9626,14 +9626,14 @@ module argurus {
         cherriei(): ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas> { var x: ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas>; () => { var y = this; }; return x; }
 >cherriei : () => Praseodymium<jugularis, oreas>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >argurus : argurus
 >oreas : oreas
 >x : Praseodymium<jugularis, oreas>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >argurus : argurus
@@ -9646,14 +9646,14 @@ module argurus {
         lindberghi(): minutus.inez<rendalli.zuluensis, rionegrensis.caniventer> { var x: minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
 >lindberghi : () => inez<zuluensis, caniventer>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : inez<zuluensis, caniventer>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
 >zuluensis : zuluensis
 >rionegrensis : rionegrensis
@@ -9690,14 +9690,14 @@ module argurus {
         dubosti(): nigra.thalia<lutreolus.schlegeli, julianae.sumatrana> { var x: nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>; () => { var y = this; }; return x; }
 >dubosti : () => thalia<schlegeli, sumatrana>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
 >sumatrana : sumatrana
 >x : thalia<schlegeli, sumatrana>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
@@ -9710,14 +9710,14 @@ module argurus {
         opossum(): nigra.dolichurus<lavali.lepturus, samarensis.pallidus> { var x: nigra.dolichurus<lavali.lepturus, samarensis.pallidus>; () => { var y = this; }; return x; }
 >opossum : () => dolichurus<lepturus, pallidus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
 >pallidus : pallidus
 >x : dolichurus<lepturus, pallidus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -9742,14 +9742,14 @@ module argurus {
         amurensis(): daubentonii.arboreus<lavali.otion, macrorhinos.konganensis> { var x: daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >amurensis : () => arboreus<otion, konganensis>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >lavali : lavali
 >otion : otion
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : arboreus<otion, konganensis>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >lavali : lavali
 >otion : otion
 >macrorhinos : macrorhinos
@@ -9776,14 +9776,14 @@ module lutreolus {
         strandi(): gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis> { var x: gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >strandi : () => klossii<jugularis, jugularis>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >x : klossii<jugularis, jugularis>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >Lanthanum : Lanthanum
@@ -9796,14 +9796,14 @@ module lutreolus {
         lar(): caurinus.mahaganus<julianae.nudicaudus, lavali.otion> { var x: caurinus.mahaganus<julianae.nudicaudus, lavali.otion>; () => { var y = this; }; return x; }
 >lar : () => mahaganus<nudicaudus, otion>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >lavali : lavali
 >otion : otion
 >x : mahaganus<nudicaudus, otion>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >lavali : lavali
@@ -9840,14 +9840,14 @@ module lutreolus {
         lemniscatus(): panglima.fundatus<gabriellae.amicus, lutreolus.foina> { var x: panglima.fundatus<gabriellae.amicus, lutreolus.foina>; () => { var y = this; }; return x; }
 >lemniscatus : () => fundatus<amicus, foina>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
 >foina : foina
 >x : fundatus<amicus, foina>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -9860,14 +9860,14 @@ module lutreolus {
         aspalax(): panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis> { var x: panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >aspalax : () => linulus<xanthognathus, konganensis>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : linulus<xanthognathus, konganensis>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >lavali : lavali
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
@@ -9904,14 +9904,14 @@ module lutreolus {
         monochromos(): howi.coludo<lavali.lepturus, lutreolus.punicus> { var x: howi.coludo<lavali.lepturus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >monochromos : () => coludo<lepturus, punicus>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lutreolus : lutreolus
 >punicus : punicus
 >x : coludo<lepturus, punicus>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >lutreolus : lutreolus
@@ -9924,14 +9924,14 @@ module lutreolus {
         purinus(): ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca> { var x: ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >purinus : () => hector<schlegeli, melanoleuca>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : hector<schlegeli, melanoleuca>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >provocax : provocax
@@ -9999,14 +9999,14 @@ module macrorhinos {
         othus(): howi.coludo<argurus.oreas, howi.marcanoi> { var x: howi.coludo<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
 >othus : () => coludo<oreas, marcanoi>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
 >marcanoi : marcanoi
 >x : coludo<oreas, marcanoi>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -10019,13 +10019,13 @@ module macrorhinos {
         hammondi(): julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion> { var x: julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>; () => { var y = this; }; return x; }
 >hammondi : () => gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -10038,13 +10038,13 @@ module macrorhinos {
 >otion : otion
 >x : gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -10087,14 +10087,14 @@ module macrorhinos {
         callosus(): trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus> { var x: trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >callosus : () => lotor<foina, robustulus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : lotor<foina, robustulus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dogramacii : dogramacii
@@ -10116,22 +10116,22 @@ module sagitta {
         zunigae(): rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>> { var x: rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>; () => { var y = this; }; return x; }
 >zunigae : () => crenulata<konganensis, dolichurus<lepturus, pallidus>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
 >pallidus : pallidus
 >x : crenulata<konganensis, dolichurus<lepturus, pallidus>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -10144,22 +10144,22 @@ module sagitta {
         microps(): daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>> { var x: daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>; () => { var y = this; }; return x; }
 >microps : () => nigricans<megaphyllus, wattsi<jugularis, sumatrana>>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
 >sumatrana : sumatrana
 >x : nigricans<megaphyllus, wattsi<jugularis, sumatrana>>
 >daubentonii : daubentonii
->nigricans : nigricans
+>nigricans : nigricans<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >julianae : julianae
@@ -10172,14 +10172,14 @@ module sagitta {
         guaporensis(): daubentonii.arboreus<gabriellae.amicus, argurus.germaini> { var x: daubentonii.arboreus<gabriellae.amicus, argurus.germaini>; () => { var y = this; }; return x; }
 >guaporensis : () => arboreus<amicus, germaini>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >argurus : argurus
 >germaini : germaini
 >x : arboreus<amicus, germaini>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >argurus : argurus
@@ -10192,14 +10192,14 @@ module sagitta {
         tonkeana(): panglima.fundatus<petrophilus.minutilla, dammermani.melanops> { var x: panglima.fundatus<petrophilus.minutilla, dammermani.melanops>; () => { var y = this; }; return x; }
 >tonkeana : () => fundatus<minutilla, melanops>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >dammermani : dammermani
 >melanops : melanops
 >x : fundatus<minutilla, melanops>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >petrophilus : petrophilus
 >minutilla : minutilla
 >dammermani : dammermani
@@ -10212,14 +10212,14 @@ module sagitta {
         montensis(): dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli> { var x: dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
 >montensis : () => siberu<aurata, oconnelli>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >x : siberu<aurata, oconnelli>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >trivirgatus : trivirgatus
@@ -10244,14 +10244,14 @@ module sagitta {
         glis(): argurus.wetmorei<argurus.oreas, howi.marcanoi> { var x: argurus.wetmorei<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
 >glis : () => wetmorei<oreas, marcanoi>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
 >marcanoi : marcanoi
 >x : wetmorei<oreas, marcanoi>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -10264,14 +10264,14 @@ module sagitta {
         dorsalis(): petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana> { var x: petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>; () => { var y = this; }; return x; }
 >dorsalis : () => sodyi<luctuosa, sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
 >sumatrana : sumatrana
 >x : sodyi<luctuosa, sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
@@ -10296,14 +10296,14 @@ module sagitta {
         sara(): nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus> { var x: nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >sara : () => gracilis<luctuosa, subspinosus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : gracilis<luctuosa, subspinosus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >imperfecta : imperfecta
@@ -10328,14 +10328,14 @@ module sagitta {
         pittieri(): samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni> { var x: samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >pittieri : () => fuscus<carolinensis, stolzmanni>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : fuscus<carolinensis, stolzmanni>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >sagitta : sagitta
@@ -10363,7 +10363,7 @@ module gabriellae {
 >T0 : T0
 >T1 : T1
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >dogramacii : dogramacii
 >robustulus : robustulus
 >caurinus : caurinus
@@ -10387,14 +10387,14 @@ module gabriellae {
         phaeura(): panglima.abidi<lutreolus.foina, argurus.peninsulae> { var x: panglima.abidi<lutreolus.foina, argurus.peninsulae>; () => { var y = this; }; return x; }
 >phaeura : () => abidi<foina, peninsulae>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
 >peninsulae : peninsulae
 >x : abidi<foina, peninsulae>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
@@ -10419,14 +10419,14 @@ module gabriellae {
         satarae(): trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni> { var x: trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>; () => { var y = this; }; return x; }
 >satarae : () => lotor<luctuosa, wilsoni>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
 >wilsoni : wilsoni
 >x : lotor<luctuosa, wilsoni>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -10451,14 +10451,14 @@ module gabriellae {
         perrensi(): rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi> { var x: rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>; () => { var y = this; }; return x; }
 >perrensi : () => crenulata<falconeri, marcanoi>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >howi : howi
 >marcanoi : marcanoi
 >x : crenulata<falconeri, marcanoi>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >howi : howi
@@ -10471,22 +10471,22 @@ module gabriellae {
         ridei(): ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> { var x: ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>; () => { var y = this; }; return x; }
 >ridei : () => hector<sumatrana, pelurus<jugularis, walkeri>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
 >walkeri : walkeri
 >x : hector<sumatrana, pelurus<jugularis, walkeri>>
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >sagitta : sagitta
@@ -10499,14 +10499,14 @@ module gabriellae {
         audeberti(): daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus> { var x: daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>; () => { var y = this; }; return x; }
 >audeberti : () => arboreus<kaiseri, punicus>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
 >x : arboreus<kaiseri, punicus>
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lutreolus : lutreolus
@@ -10519,14 +10519,14 @@ module gabriellae {
         Lutetium(): macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri> { var x: macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>; () => { var y = this; }; return x; }
 >Lutetium : () => marmosurus<stolzmanni, thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >lavali : lavali
 >thaeleri : thaeleri
 >x : marmosurus<stolzmanni, thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >lavali : lavali
@@ -10539,9 +10539,9 @@ module gabriellae {
         atrox(): samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae> { var x: samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >atrox : () => fuscus<oralis<steerii, lepturus>, koepckeae>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -10550,9 +10550,9 @@ module gabriellae {
 >koepckeae : koepckeae
 >x : fuscus<oralis<steerii, lepturus>, koepckeae>
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >lavali : lavali
@@ -10570,22 +10570,22 @@ module gabriellae {
         tenuipes(): howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x: howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
 >tenuipes : () => coludo<daphaenodon, amphibius<daphaenodon, uralensis>>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >x : coludo<daphaenodon, amphibius<daphaenodon, uralensis>>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
@@ -10643,22 +10643,22 @@ module imperfecta {
         didactylus(): panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
 >didactylus : () => abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -10671,14 +10671,14 @@ module imperfecta {
         schreibersii(): nigra.gracilis<argurus.luctuosa, ruatanica.americanus> { var x: nigra.gracilis<argurus.luctuosa, ruatanica.americanus>; () => { var y = this; }; return x; }
 >schreibersii : () => gracilis<luctuosa, americanus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >ruatanica : ruatanica
 >americanus : americanus
 >x : gracilis<luctuosa, americanus>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >ruatanica : ruatanica
@@ -10718,14 +10718,14 @@ module imperfecta {
         Gadolinium(): nigra.caucasica<sagitta.stolzmanni, patas.uralensis> { var x: nigra.caucasica<sagitta.stolzmanni, patas.uralensis>; () => { var y = this; }; return x; }
 >Gadolinium : () => caucasica<stolzmanni, uralensis>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >patas : patas
 >uralensis : uralensis
 >x : caucasica<stolzmanni, uralensis>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >patas : patas
@@ -10738,22 +10738,22 @@ module imperfecta {
         oasicus(): caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> { var x: caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>; () => { var y = this; }; return x; }
 >oasicus : () => johorensis<peninsulae, arboreus<germaini, stolzmanni>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : johorensis<peninsulae, arboreus<germaini, stolzmanni>>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
@@ -10814,14 +10814,14 @@ module imperfecta {
         siskiyou(): minutus.inez<macrorhinos.konganensis, samarensis.pallidus> { var x: minutus.inez<macrorhinos.konganensis, samarensis.pallidus>; () => { var y = this; }; return x; }
 >siskiyou : () => inez<konganensis, pallidus>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >samarensis : samarensis
 >pallidus : pallidus
 >x : inez<konganensis, pallidus>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >samarensis : samarensis
@@ -10877,22 +10877,22 @@ module imperfecta {
         leschenaultii(): argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>> { var x: argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
 >leschenaultii : () => dauricus<jugularis, Praseodymium<germaini, megaphyllus>>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >x : dauricus<jugularis, Praseodymium<germaini, megaphyllus>>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >caurinus : caurinus
@@ -10905,14 +10905,14 @@ module imperfecta {
         ludia(): caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus> { var x: caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>; () => { var y = this; }; return x; }
 >ludia : () => johorensis<caniventer, punicus>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >lutreolus : lutreolus
 >punicus : punicus
 >x : johorensis<caniventer, punicus>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >lutreolus : lutreolus
@@ -10925,14 +10925,14 @@ module imperfecta {
         sinicus(): macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus> { var x: macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>; () => { var y = this; }; return x; }
 >sinicus : () => marmosurus<daphaenodon, amicus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >gabriellae : gabriellae
 >amicus : amicus
 >x : marmosurus<daphaenodon, amicus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >gabriellae : gabriellae
@@ -10978,13 +10978,13 @@ module quasiater {
         bilarni(): samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae> { var x: samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >bilarni : () => cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -10993,13 +10993,13 @@ module quasiater {
 >koepckeae : koepckeae
 >x : cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -11076,14 +11076,14 @@ module petrophilus {
         Lawrencium(): nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus> { var x: nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>; () => { var y = this; }; return x; }
 >Lawrencium : () => dolichurus<sumatrana, subspinosus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : dolichurus<sumatrana, subspinosus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >julianae : julianae
 >sumatrana : sumatrana
 >imperfecta : imperfecta
@@ -11108,14 +11108,14 @@ module petrophilus {
         breviceps(): argurus.dauricus<dogramacii.aurata, dammermani.melanops> { var x: argurus.dauricus<dogramacii.aurata, dammermani.melanops>; () => { var y = this; }; return x; }
 >breviceps : () => dauricus<aurata, melanops>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
 >melanops : melanops
 >x : dauricus<aurata, melanops>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
@@ -11168,11 +11168,11 @@ module caurinus {
     export class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
 >megaphyllus : megaphyllus
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >julianae : julianae
 >acariensis : acariensis
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -11217,22 +11217,22 @@ module caurinus {
         lepida(): rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>> { var x: rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>; () => { var y = this; }; return x; }
 >lepida : () => crenulata<wilsoni, fundatus<amicus, foina>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
 >foina : foina
 >x : crenulata<wilsoni, fundatus<amicus, foina>>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -11269,14 +11269,14 @@ module caurinus {
         perotensis(): samarensis.cahirinus<minutus.portoricensis, lavali.lepturus> { var x: samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>; () => { var y = this; }; return x; }
 >perotensis : () => cahirinus<portoricensis, lepturus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >minutus : minutus
 >portoricensis : portoricensis
 >lavali : lavali
 >lepturus : lepturus
 >x : cahirinus<portoricensis, lepturus>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >minutus : minutus
 >portoricensis : portoricensis
 >lavali : lavali
@@ -11320,14 +11320,14 @@ module minutus {
         aequatorianus(): gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata> { var x: gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
 >aequatorianus : () => klossii<nudicaudus, aurata>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >x : klossii<nudicaudus, aurata>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
@@ -11340,14 +11340,14 @@ module minutus {
         rhinogradoides(): samarensis.cahirinus<quasiater.carolinensis, julianae.durangae> { var x: samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>; () => { var y = this; }; return x; }
 >rhinogradoides : () => cahirinus<carolinensis, durangae>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >julianae : julianae
 >durangae : durangae
 >x : cahirinus<carolinensis, durangae>
 >samarensis : samarensis
->cahirinus : cahirinus
+>cahirinus : cahirinus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >julianae : julianae
@@ -11379,14 +11379,14 @@ module lutreolus {
         Promethium(): samarensis.pelurus<argurus.germaini, julianae.durangae> { var x: samarensis.pelurus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
 >Promethium : () => pelurus<germaini, durangae>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
 >durangae : durangae
 >x : pelurus<germaini, durangae>
 >samarensis : samarensis
->pelurus : pelurus
+>pelurus : pelurus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >julianae : julianae
@@ -11399,14 +11399,14 @@ module lutreolus {
         salinae(): gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis> { var x: gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >salinae : () => klossii<konganensis, carolinensis>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : klossii<konganensis, carolinensis>
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >quasiater : quasiater
@@ -11419,14 +11419,14 @@ module lutreolus {
         kerri(): howi.coludo<quasiater.carolinensis, minutus.portoricensis> { var x: howi.coludo<quasiater.carolinensis, minutus.portoricensis>; () => { var y = this; }; return x; }
 >kerri : () => coludo<carolinensis, portoricensis>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
 >portoricensis : portoricensis
 >x : coludo<carolinensis, portoricensis>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
@@ -11439,14 +11439,14 @@ module lutreolus {
         scotti(): quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus> { var x: quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >scotti : () => wattsi<konganensis, robustulus>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : wattsi<konganensis, robustulus>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >dogramacii : dogramacii
@@ -11459,14 +11459,14 @@ module lutreolus {
         camerunensis(): julianae.gerbillus<imperfecta.subspinosus, julianae.durangae> { var x: julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>; () => { var y = this; }; return x; }
 >camerunensis : () => gerbillus<subspinosus, durangae>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >julianae : julianae
 >durangae : durangae
 >x : gerbillus<subspinosus, durangae>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >julianae : julianae
@@ -11491,22 +11491,22 @@ module lutreolus {
         siebersi(): trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>> { var x: trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>; () => { var y = this; }; return x; }
 >siebersi : () => lotor<oreas, thalia<uralensis, wilsoni>>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >lavali : lavali
 >wilsoni : wilsoni
 >x : lotor<oreas, thalia<uralensis, wilsoni>>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >lavali : lavali
@@ -11531,14 +11531,14 @@ module lutreolus {
         layardi(): julianae.albidens<howi.marcanoi, dogramacii.koepckeae> { var x: julianae.albidens<howi.marcanoi, dogramacii.koepckeae>; () => { var y = this; }; return x; }
 >layardi : () => albidens<marcanoi, koepckeae>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >x : albidens<marcanoi, koepckeae>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >dogramacii : dogramacii
@@ -11575,14 +11575,14 @@ module lutreolus {
         argentiventer(): trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> { var x: trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>; () => { var y = this; }; return x; }
 >argentiventer : () => mixtus<amicus, punicus>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
 >punicus : punicus
 >x : mixtus<amicus, punicus>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -11601,11 +11601,11 @@ module lutreolus {
 >T0 : T0
 >T1 : T1
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >lavali : lavali
@@ -11618,14 +11618,14 @@ module lutreolus {
         antinorii(): petrophilus.sodyi<quasiater.carolinensis, argurus.germaini> { var x: petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>; () => { var y = this; }; return x; }
 >antinorii : () => sodyi<carolinensis, germaini>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >argurus : argurus
 >germaini : germaini
 >x : sodyi<carolinensis, germaini>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >argurus : argurus
@@ -11638,14 +11638,14 @@ module lutreolus {
         voi(): caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis> { var x: caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >voi : () => johorensis<melanops, konganensis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >x : johorensis<melanops, konganensis>
 >caurinus : caurinus
->johorensis : johorensis
+>johorensis : johorensis<T0, T1>
 >dammermani : dammermani
 >melanops : melanops
 >macrorhinos : macrorhinos
@@ -11670,14 +11670,14 @@ module lutreolus {
         truncatus(): trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina> { var x: trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina>; () => { var y = this; }; return x; }
 >truncatus : () => lotor<stolzmanni, foina>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >lutreolus : lutreolus
 >foina : foina
 >x : lotor<stolzmanni, foina>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >lutreolus : lutreolus
@@ -11702,14 +11702,14 @@ module lutreolus {
         praedatrix(): howi.angulatus<dogramacii.kaiseri, julianae.steerii> { var x: howi.angulatus<dogramacii.kaiseri, julianae.steerii>; () => { var y = this; }; return x; }
 >praedatrix : () => angulatus<kaiseri, steerii>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >julianae : julianae
 >steerii : steerii
 >x : angulatus<kaiseri, steerii>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >julianae : julianae
@@ -11722,30 +11722,30 @@ module lutreolus {
         mzabi(): quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>> { var x: quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>; () => { var y = this; }; return x; }
 >mzabi : () => wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
 >pallidus : pallidus
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >x : wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>
 >quasiater : quasiater
->wattsi : wattsi
+>wattsi : wattsi<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >julianae : julianae
 >steerii : steerii
 >samarensis : samarensis
 >pallidus : pallidus
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >Lanthanum : Lanthanum
@@ -11758,9 +11758,9 @@ module lutreolus {
         xanthinus(): nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi> { var x: nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>; () => { var y = this; }; return x; }
 >xanthinus : () => gracilis<linulus<kaiseri, portoricensis>, marcanoi>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
@@ -11769,9 +11769,9 @@ module lutreolus {
 >marcanoi : marcanoi
 >x : gracilis<linulus<kaiseri, portoricensis>, marcanoi>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
@@ -11864,14 +11864,14 @@ module argurus {
         palmarum(): macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri> { var x: macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>; () => { var y = this; }; return x; }
 >palmarum : () => marmosurus<megalonyx, thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >lavali : lavali
 >thaeleri : thaeleri
 >x : marmosurus<megalonyx, thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >lavali : lavali
@@ -11891,14 +11891,14 @@ module sagitta {
         riparius(): nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus> { var x: nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
 >riparius : () => dolichurus<koepckeae, psilurus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >caurinus : caurinus
 >psilurus : psilurus
 >x : dolichurus<koepckeae, psilurus>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >caurinus : caurinus
@@ -11947,9 +11947,9 @@ module sagitta {
         walleri(): rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus> { var x: rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >walleri : () => moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -11958,9 +11958,9 @@ module sagitta {
 >echinatus : echinatus
 >x : moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -12011,14 +12011,14 @@ module sagitta {
         hipposideros(): julianae.albidens<argurus.luctuosa, gabriellae.echinatus> { var x: julianae.albidens<argurus.luctuosa, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >hipposideros : () => albidens<luctuosa, echinatus>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : albidens<luctuosa, echinatus>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >gabriellae : gabriellae
@@ -12059,7 +12059,7 @@ module dammermani {
     export class melanops extends minutus.inez<sagitta.stolzmanni, dammermani.melanops> {
 >melanops : melanops
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >dammermani : dammermani
@@ -12080,9 +12080,9 @@ module dammermani {
         harwoodi(): rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni> { var x: rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>; () => { var y = this; }; return x; }
 >harwoodi : () => veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -12091,9 +12091,9 @@ module dammermani {
 >wilsoni : wilsoni
 >x : veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis
+>veraecrucis : veraecrucis<T0, T1>
 >nigra : nigra
->dolichurus : dolichurus
+>dolichurus : dolichurus<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >samarensis : samarensis
@@ -12144,14 +12144,14 @@ module dammermani {
         condorensis(): imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus> { var x: imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>; () => { var y = this; }; return x; }
 >condorensis : () => ciliolabrum<pallidus, psilurus>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >caurinus : caurinus
 >psilurus : psilurus
 >x : ciliolabrum<pallidus, psilurus>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >samarensis : samarensis
 >pallidus : pallidus
 >caurinus : caurinus
@@ -12164,14 +12164,14 @@ module dammermani {
         xerophila(): panglima.abidi<minutus.portoricensis, patas.uralensis> { var x: panglima.abidi<minutus.portoricensis, patas.uralensis>; () => { var y = this; }; return x; }
 >xerophila : () => abidi<portoricensis, uralensis>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >minutus : minutus
 >portoricensis : portoricensis
 >patas : patas
 >uralensis : uralensis
 >x : abidi<portoricensis, uralensis>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >minutus : minutus
 >portoricensis : portoricensis
 >patas : patas
@@ -12184,30 +12184,30 @@ module dammermani {
         laminatus(): panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>> { var x: panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>; () => { var y = this; }; return x; }
 >laminatus : () => fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
 >subspinosus : subspinosus
 >x : fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >samarensis : samarensis
->fuscus : fuscus
+>fuscus : fuscus<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >imperfecta : imperfecta
@@ -12232,14 +12232,14 @@ module dammermani {
         hidalgo(): minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis> { var x: minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>; () => { var y = this; }; return x; }
 >hidalgo : () => inez<oconnelli, jugularis>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >Lanthanum : Lanthanum
 >jugularis : jugularis
 >x : inez<oconnelli, jugularis>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >trivirgatus : trivirgatus
 >oconnelli : oconnelli
 >Lanthanum : Lanthanum
@@ -12264,14 +12264,14 @@ module dammermani {
         philippii(): nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni> { var x: nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >philippii : () => gracilis<walkeri, stolzmanni>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : gracilis<walkeri, stolzmanni>
 >nigra : nigra
->gracilis : gracilis
+>gracilis : gracilis<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >sagitta : sagitta
@@ -12284,14 +12284,14 @@ module dammermani {
         bocagei(): julianae.albidens<lavali.wilsoni, lavali.thaeleri> { var x: julianae.albidens<lavali.wilsoni, lavali.thaeleri>; () => { var y = this; }; return x; }
 >bocagei : () => albidens<wilsoni, thaeleri>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lavali : lavali
 >thaeleri : thaeleri
 >x : albidens<wilsoni, thaeleri>
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >lavali : lavali
 >wilsoni : wilsoni
 >lavali : lavali
@@ -12313,30 +12313,30 @@ module argurus {
         aitkeni(): trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>> { var x: trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>; () => { var y = this; }; return x; }
 >aitkeni : () => mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
 >melanops : melanops
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
 >melanops : melanops
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
@@ -12397,14 +12397,14 @@ module argurus {
         sordidus(): rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> { var x: rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>; () => { var y = this; }; return x; }
 >sordidus : () => moojeni<konganensis, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : moojeni<konganensis, echinatus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >gabriellae : gabriellae
@@ -12429,14 +12429,14 @@ module argurus {
         cavernarum(): minutus.inez<gabriellae.echinatus, argurus.luctuosa> { var x: minutus.inez<gabriellae.echinatus, argurus.luctuosa>; () => { var y = this; }; return x; }
 >cavernarum : () => inez<echinatus, luctuosa>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >argurus : argurus
 >luctuosa : luctuosa
 >x : inez<echinatus, luctuosa>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >gabriellae : gabriellae
 >echinatus : echinatus
 >argurus : argurus
@@ -12458,9 +12458,9 @@ module argurus {
         gravis(): nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri> { var x: nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>; () => { var y = this; }; return x; }
 >gravis : () => caucasica<crenulata<falconeri, marcanoi>, kaiseri>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >howi : howi
@@ -12469,9 +12469,9 @@ module argurus {
 >kaiseri : kaiseri
 >x : caucasica<crenulata<falconeri, marcanoi>, kaiseri>
 >nigra : nigra
->caucasica : caucasica
+>caucasica : caucasica<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >howi : howi
@@ -12486,22 +12486,22 @@ module argurus {
         ruschii(): imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
 >ruschii : () => lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
 >minutilla : minutilla
 >x : lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -12526,30 +12526,30 @@ module argurus {
         fernandezi(): dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>> { var x: dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>; () => { var y = this; }; return x; }
 >fernandezi : () => siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
 >sumatrana : sumatrana
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
 >peninsulae : peninsulae
 >x : siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >nigra : nigra
->thalia : thalia
+>thalia : thalia<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >julianae : julianae
 >sumatrana : sumatrana
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >argurus : argurus
@@ -12586,14 +12586,14 @@ module argurus {
         eburneae(): chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis> { var x: chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>; () => { var y = this; }; return x; }
 >eburneae : () => sarasinorum<konganensis, acariensis>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >julianae : julianae
 >acariensis : acariensis
 >x : sarasinorum<konganensis, acariensis>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >julianae : julianae
@@ -12606,22 +12606,22 @@ module argurus {
         tatei(): argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> { var x: argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>; () => { var y = this; }; return x; }
 >tatei : () => pygmaea<oreas, fundatus<carolinensis, daphaenodon>>
 >argurus : argurus
->pygmaea : pygmaea
+>pygmaea : pygmaea<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >x : pygmaea<oreas, fundatus<carolinensis, daphaenodon>>
 >argurus : argurus
->pygmaea : pygmaea
+>pygmaea : pygmaea<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >macrorhinos : macrorhinos
@@ -12658,14 +12658,14 @@ module argurus {
         delator(): argurus.netscheri<dogramacii.kaiseri, lavali.lepturus> { var x: argurus.netscheri<dogramacii.kaiseri, lavali.lepturus>; () => { var y = this; }; return x; }
 >delator : () => netscheri<kaiseri, lepturus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
 >lepturus : lepturus
 >x : netscheri<kaiseri, lepturus>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >lavali : lavali
@@ -12678,11 +12678,11 @@ module argurus {
         nyikae(): trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis> { var x: trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>; () => { var y = this; }; return x; }
 >nyikae : () => tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
@@ -12693,11 +12693,11 @@ module argurus {
 >acariensis : acariensis
 >x : tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons
+>tumidifrons : tumidifrons<T0, T1>
 >howi : howi
->angulatus : angulatus
+>angulatus : angulatus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >minutus : minutus
@@ -12714,13 +12714,13 @@ module argurus {
         ruemmleri(): panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>> { var x: panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>; () => { var y = this; }; return x; }
 >ruemmleri : () => amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -12730,20 +12730,20 @@ module argurus {
 >dogramacii : dogramacii
 >aurata : aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >beisa : beisa
 >x : amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -12753,7 +12753,7 @@ module argurus {
 >dogramacii : dogramacii
 >aurata : aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -12772,7 +12772,7 @@ module ruatanica {
 >T0 : T0
 >T1 : T1
 >ruatanica : ruatanica
->hector : hector
+>hector : hector<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >gabriellae : gabriellae
@@ -12781,30 +12781,30 @@ module ruatanica {
         clara(): panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>> { var x: panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>>; () => { var y = this; }; return x; }
 >clara : () => amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >beisa : beisa
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >x : amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >beisa : beisa
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
@@ -12817,14 +12817,14 @@ module ruatanica {
         spectabilis(): petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis> { var x: petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >spectabilis : () => sodyi<caniventer, carolinensis>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : sodyi<caniventer, carolinensis>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >quasiater : quasiater
@@ -12837,9 +12837,9 @@ module ruatanica {
         kamensis(): trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus> { var x: trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>; () => { var y = this; }; return x; }
 >kamensis : () => lotor<linulus<kaiseri, portoricensis>, lepturus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
@@ -12848,9 +12848,9 @@ module ruatanica {
 >lepturus : lepturus
 >x : lotor<linulus<kaiseri, portoricensis>, lepturus>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >dogramacii : dogramacii
 >kaiseri : kaiseri
 >minutus : minutus
@@ -12889,30 +12889,30 @@ module ruatanica {
         yerbabuenae(): dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>> { var x: dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>; () => { var y = this; }; return x; }
 >yerbabuenae : () => siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
 >minutilla : minutilla
 >x : siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>
 >dammermani : dammermani
->siberu : siberu
+>siberu : siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >dammermani : dammermani
 >melanops : melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >petrophilus : petrophilus
@@ -12925,14 +12925,14 @@ module ruatanica {
         davidi(): trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni> { var x: trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>; () => { var y = this; }; return x; }
 >davidi : () => mixtus<melanoleuca, stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >x : mixtus<melanoleuca, stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >provocax : provocax
 >melanoleuca : melanoleuca
 >sagitta : sagitta
@@ -12945,25 +12945,25 @@ module ruatanica {
         pilirostris(): argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis> { var x: argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>; () => { var y = this; }; return x; }
 >pilirostris : () => wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, konganensis>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -12972,25 +12972,25 @@ module ruatanica {
 >konganensis : konganensis
 >x : wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, konganensis>
 >argurus : argurus
->wetmorei : wetmorei
+>wetmorei : wetmorei<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >patas : patas
 >uralensis : uralensis
 >gabriellae : gabriellae
->klossii : klossii
+>klossii : klossii<T0, T1>
 >julianae : julianae
 >nudicaudus : nudicaudus
 >dogramacii : dogramacii
 >aurata : aurata
 >sagitta : sagitta
->leptoceros : leptoceros
+>leptoceros : leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus
+>arboreus : arboreus<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >rionegrensis : rionegrensis
@@ -13005,30 +13005,30 @@ module ruatanica {
         catherinae(): imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>> { var x: imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>; () => { var y = this; }; return x; }
 >catherinae : () => lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
 >psilurus : psilurus
 >x : lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >howi : howi
 >marcanoi : marcanoi
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >macrorhinos : macrorhinos
 >konganensis : konganensis
 >caurinus : caurinus
@@ -13053,14 +13053,14 @@ module ruatanica {
         Terbium(): caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa> { var x: caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>; () => { var y = this; }; return x; }
 >Terbium : () => mahaganus<galapagoensis, luctuosa>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >argurus : argurus
 >luctuosa : luctuosa
 >x : mahaganus<galapagoensis, luctuosa>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >julianae : julianae
 >galapagoensis : galapagoensis
 >argurus : argurus
@@ -13073,22 +13073,22 @@ module ruatanica {
         thomensis(): minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>> { var x: minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>; () => { var y = this; }; return x; }
 >thomensis : () => inez<oreas, albidens<luctuosa, echinatus>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >gabriellae : gabriellae
 >echinatus : echinatus
 >x : inez<oreas, albidens<luctuosa, echinatus>>
 >minutus : minutus
->inez : inez
+>inez : inez<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >julianae : julianae
->albidens : albidens
+>albidens : albidens<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >gabriellae : gabriellae
@@ -13124,14 +13124,14 @@ module caurinus {
         maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis> { var x: ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>; () => { var y = this; }; return x; }
 >maini : () => Praseodymium<thaeleri, acariensis>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >julianae : julianae
 >acariensis : acariensis
 >x : Praseodymium<thaeleri, acariensis>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium
+>Praseodymium : Praseodymium<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >julianae : julianae
@@ -13151,13 +13151,13 @@ module argurus {
         loriae(): rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus> { var x: rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>; () => { var y = this; }; return x; }
 >loriae : () => moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -13170,13 +13170,13 @@ module argurus {
 >punicus : punicus
 >x : moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus
+>marmosurus : marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni
+>moojeni : moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -13204,9 +13204,9 @@ module panamensis {
         duthieae(): caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata> { var x: caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>; () => { var y = this; }; return x; }
 >duthieae : () => mahaganus<coludo<oreas, marcanoi>, aurata>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -13215,9 +13215,9 @@ module panamensis {
 >aurata : aurata
 >x : mahaganus<coludo<oreas, marcanoi>, aurata>
 >caurinus : caurinus
->mahaganus : mahaganus
+>mahaganus : mahaganus<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >howi : howi
@@ -13232,14 +13232,14 @@ module panamensis {
         guereza(): howi.coludo<sagitta.stolzmanni, quasiater.carolinensis> { var x: howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >guereza : () => coludo<stolzmanni, carolinensis>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : coludo<stolzmanni, carolinensis>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >quasiater : quasiater
@@ -13252,11 +13252,11 @@ module panamensis {
         buselaphus(): daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>> { var x: daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>; () => { var y = this; }; return x; }
 >buselaphus : () => nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
@@ -13264,18 +13264,18 @@ module panamensis {
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
 >punicus : punicus
 >x : nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>
 >daubentonii : daubentonii
->nesiotes : nesiotes
+>nesiotes : nesiotes<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor
+>lotor : lotor<T0, T1>
 >panglima : panglima
->abidi : abidi
+>abidi : abidi<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >caurinus : caurinus
@@ -13283,7 +13283,7 @@ module panamensis {
 >dogramacii : dogramacii
 >koepckeae : koepckeae
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -13296,30 +13296,30 @@ module panamensis {
         nuttalli(): sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>> { var x: sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>; () => { var y = this; }; return x; }
 >nuttalli : () => cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
 >nudicaudus : nudicaudus
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
 >xanthognathus : xanthognathus
 >x : cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>
 >sagitta : sagitta
->cinereus : cinereus
+>cinereus : cinereus<T0, T1>
 >argurus : argurus
->netscheri : netscheri
+>netscheri : netscheri<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
 >nudicaudus : nudicaudus
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum
+>sarasinorum : sarasinorum<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >lavali : lavali
@@ -13332,9 +13332,9 @@ module panamensis {
         pelii(): rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii> { var x: rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>; () => { var y = this; }; return x; }
 >pelii : () => crenulata<nitidus<caniventer, jugularis>, steerii>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >Lanthanum : Lanthanum
@@ -13343,9 +13343,9 @@ module panamensis {
 >steerii : steerii
 >x : crenulata<nitidus<caniventer, jugularis>, steerii>
 >rendalli : rendalli
->crenulata : crenulata
+>crenulata : crenulata<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >rionegrensis : rionegrensis
 >caniventer : caniventer
 >Lanthanum : Lanthanum
@@ -13384,14 +13384,14 @@ module panamensis {
         vampyrus(): julianae.oralis<lutreolus.foina, provocax.melanoleuca> { var x: julianae.oralis<lutreolus.foina, provocax.melanoleuca>; () => { var y = this; }; return x; }
 >vampyrus : () => oralis<foina, melanoleuca>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >provocax : provocax
 >melanoleuca : melanoleuca
 >x : oralis<foina, melanoleuca>
 >julianae : julianae
->oralis : oralis
+>oralis : oralis<T0, T1>
 >lutreolus : lutreolus
 >foina : foina
 >provocax : provocax
@@ -13413,54 +13413,54 @@ module petrophilus {
         palmeri(): panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>> { var x: panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>; () => { var y = this; }; return x; }
 >palmeri : () => amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
 >melanops : melanops
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >howi : howi
->coludo : coludo
+>coludo : coludo<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >macrorhinos : macrorhinos
 >daphaenodon : daphaenodon
 >patas : patas
 >uralensis : uralensis
 >trivirgatus : trivirgatus
->mixtus : mixtus
+>mixtus : mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus
+>dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
 >aurata : aurata
 >dammermani : dammermani
 >melanops : melanops
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >lavali : lavali
 >lepturus : lepturus
 >quasiater : quasiater
@@ -13473,14 +13473,14 @@ module petrophilus {
         baeops(): Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus> { var x: Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>; () => { var y = this; }; return x; }
 >baeops : () => nitidus<thaeleri, lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >lavali : lavali
 >lepturus : lepturus
 >x : nitidus<thaeleri, lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus
+>nitidus : nitidus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >lavali : lavali
@@ -13493,9 +13493,9 @@ module petrophilus {
         ozensis(): imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina> { var x: imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>; () => { var y = this; }; return x; }
 >ozensis : () => lasiurus<fundatus<amicus, foina>, foina>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -13504,9 +13504,9 @@ module petrophilus {
 >foina : foina
 >x : lasiurus<fundatus<amicus, foina>, foina>
 >imperfecta : imperfecta
->lasiurus : lasiurus
+>lasiurus : lasiurus<T0, T1>
 >panglima : panglima
->fundatus : fundatus
+>fundatus : fundatus<T0, T1>
 >gabriellae : gabriellae
 >amicus : amicus
 >lutreolus : lutreolus
@@ -13533,22 +13533,22 @@ module petrophilus {
         montivaga(): panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>> { var x: panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>; () => { var y = this; }; return x; }
 >montivaga : () => setulosus<beisa, linulus<megaphyllus, megaphyllus>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >x : setulosus<beisa, linulus<megaphyllus, megaphyllus>>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >lavali : lavali
 >beisa : beisa
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >caurinus : caurinus
 >megaphyllus : megaphyllus
 >caurinus : caurinus
@@ -13570,14 +13570,14 @@ module caurinus {
         socialis(): panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus> { var x: panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>; () => { var y = this; }; return x; }
 >socialis : () => amphibius<falconeri, psilurus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
 >psilurus : psilurus
 >x : amphibius<falconeri, psilurus>
 >panglima : panglima
->amphibius : amphibius
+>amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >caurinus : caurinus
@@ -13590,14 +13590,14 @@ module caurinus {
         lundi(): petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi> { var x: petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
 >lundi : () => sodyi<falconeri, bobrinskoi>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
 >bobrinskoi : bobrinskoi
 >x : sodyi<falconeri, bobrinskoi>
 >petrophilus : petrophilus
->sodyi : sodyi
+>sodyi : sodyi<T0, T1>
 >trivirgatus : trivirgatus
 >falconeri : falconeri
 >quasiater : quasiater
@@ -13610,14 +13610,14 @@ module caurinus {
         araeum(): imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa> { var x: imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>; () => { var y = this; }; return x; }
 >araeum : () => ciliolabrum<carolinensis, beisa>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
 >beisa : beisa
 >x : ciliolabrum<carolinensis, beisa>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum
+>ciliolabrum : ciliolabrum<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >lavali : lavali
@@ -13630,14 +13630,14 @@ module caurinus {
         calamianensis(): julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis> { var x: julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>; () => { var y = this; }; return x; }
 >calamianensis : () => gerbillus<thaeleri, carolinensis>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
 >carolinensis : carolinensis
 >x : gerbillus<thaeleri, carolinensis>
 >julianae : julianae
->gerbillus : gerbillus
+>gerbillus : gerbillus<T0, T1>
 >lavali : lavali
 >thaeleri : thaeleri
 >quasiater : quasiater
@@ -13650,14 +13650,14 @@ module caurinus {
         petersoni(): panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus> { var x: panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>; () => { var y = this; }; return x; }
 >petersoni : () => setulosus<walkeri, robustulus>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >dogramacii : dogramacii
 >robustulus : robustulus
 >x : setulosus<walkeri, robustulus>
 >panamensis : panamensis
->setulosus : setulosus
+>setulosus : setulosus<T0, T1>
 >sagitta : sagitta
 >walkeri : walkeri
 >dogramacii : dogramacii
@@ -13670,14 +13670,14 @@ module caurinus {
         nitela(): panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi> { var x: panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>; () => { var y = this; }; return x; }
 >nitela : () => linulus<megalonyx, marcanoi>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >howi : howi
 >marcanoi : marcanoi
 >x : linulus<megalonyx, marcanoi>
 >panamensis : panamensis
->linulus : linulus
+>linulus : linulus<T0, T1>
 >Lanthanum : Lanthanum
 >megalonyx : megalonyx
 >howi : howi
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 40d58a0274f..909c6f45f6f 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -8,7 +8,7 @@ module M1 {
 >ar : any
 >f : any
 >e : any
->Array : Array
+>Array : T[]
 >A : A
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
diff --git a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
index 263cf2fd77f..fad3c15489c 100644
--- a/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
+++ b/tests/baselines/reference/reversedRecusiveTypeInstantiation.types
@@ -14,14 +14,14 @@ interface A<StringArgPos1, NumberArgPos2> {
 
    zPos2Pos1 : A<NumberArgPos2, StringArgPos1>
 >zPos2Pos1 : A<NumberArgPos2, StringArgPos1>
->A : A
+>A : A<StringArgPos1, NumberArgPos2>
 >NumberArgPos2 : NumberArgPos2
 >StringArgPos1 : StringArgPos1
 }
 
 var a : A<string, number>
 >a : A<string, number>
->A : A
+>A : A<StringArgPos1, NumberArgPos2>
 
 a.zPos2Pos1.xPos1 = 1
 >a.zPos2Pos1.xPos1 = 1 : number
diff --git a/tests/baselines/reference/sourceMapValidationImport.types b/tests/baselines/reference/sourceMapValidationImport.types
index a1f03e20976..4ea0c3fcd5d 100644
--- a/tests/baselines/reference/sourceMapValidationImport.types
+++ b/tests/baselines/reference/sourceMapValidationImport.types
@@ -8,12 +8,12 @@ export module m {
 }
 import a = m.c;
 >a : typeof c
->m : c
+>m : typeof m
 >c : c
 
 export import b = m.c;
 >b : typeof c
->m : c
+>m : typeof m
 >c : c
 
 var x = new a();
diff --git a/tests/baselines/reference/specializationError.types b/tests/baselines/reference/specializationError.types
index 34d2f945025..c79816eaf8a 100644
--- a/tests/baselines/reference/specializationError.types
+++ b/tests/baselines/reference/specializationError.types
@@ -16,21 +16,21 @@ interface Bar {
     bar(value: "Menu"): Promise<string>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
 >value : "Menu"
->Promise : Promise
+>Promise : Promise<T>
 
     bar<T>(value: string, element: string): Promise<T>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
 >T : T
 >value : string
 >element : string
->Promise : Promise
+>Promise : Promise<T>
 >T : T
 
     bar<T>(value: string): Promise<T>;
 >bar : { (value: "Menu"): Promise<string>; <T>(value: string, element: string): Promise<T>; <T>(value: string): Promise<T>; }
 >T : T
 >value : string
->Promise : Promise
+>Promise : Promise<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/specializeVarArgs1.types b/tests/baselines/reference/specializeVarArgs1.types
index edcfc64b534..4cdf5790983 100644
--- a/tests/baselines/reference/specializeVarArgs1.types
+++ b/tests/baselines/reference/specializeVarArgs1.types
@@ -8,7 +8,7 @@ interface Observable<T>{ }
 interface ObservableArray<T> extends Observable<T[]>
 >ObservableArray : ObservableArray<T>
 >T : T
->Observable : Observable
+>Observable : Observable<T>
 >T : T
 
 {
@@ -25,7 +25,7 @@ interface ObservableArray<T> extends Observable<T[]>
 function observableArray<T>(): ObservableArray<T> { return null;}
 >observableArray : <T>() => ObservableArray<T>
 >T : T
->ObservableArray : ObservableArray
+>ObservableArray : ObservableArray<T>
 >T : T
 
  
diff --git a/tests/baselines/reference/specializedInheritedConstructors1.types b/tests/baselines/reference/specializedInheritedConstructors1.types
index d5b8aa15f8b..a073efa24d7 100644
--- a/tests/baselines/reference/specializedInheritedConstructors1.types
+++ b/tests/baselines/reference/specializedInheritedConstructors1.types
@@ -14,7 +14,7 @@ class View<TModel> {
 
     constructor(options: ViewOptions<TModel>) { }
 >options : ViewOptions<TModel>
->ViewOptions : ViewOptions
+>ViewOptions : ViewOptions<TModel>
 >TModel : TModel
 
     model: TModel;
@@ -27,12 +27,12 @@ class Model { }
 
 class MyView extends View<Model> { }
 >MyView : MyView
->View : View
+>View : View<TModel>
 >Model : Model
 
 var m: ViewOptions<Model> = { model: new Model() };
 >m : ViewOptions<Model>
->ViewOptions : ViewOptions
+>ViewOptions : ViewOptions<TModel>
 >Model : Model
 >{ model: new Model() } : { model: Model; }
 >model : Model
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.types b/tests/baselines/reference/specializedLambdaTypeArguments.types
index dbde26b516e..3eb2fbc959e 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.types
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.types
@@ -5,12 +5,12 @@ class X<A> {
 
 	prop: X< <Tany>() => Tany >;
 >prop : X<<Tany>() => Tany>
->X : X
+>X : X<A>
 >Tany : Tany
 >Tany : Tany
 }
 var a: X<boolean>;
 >a : X<boolean>
->X : X
+>X : X<A>
  
 
diff --git a/tests/baselines/reference/subtypesOfAny.types b/tests/baselines/reference/subtypesOfAny.types
index 0b13a271bfa..ec88559ce9b 100644
--- a/tests/baselines/reference/subtypesOfAny.types
+++ b/tests/baselines/reference/subtypesOfAny.types
@@ -132,7 +132,7 @@ interface I11 {
 
     foo: A2<number>;
 >foo : A2<number>
->A2 : A2
+>A2 : A2<T>
 }
 
 
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 687184a609e..5006e00d52b 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a : (x: Base[], y: Derived[]) => Derived[]
 
@@ -758,28 +758,28 @@ var r12arg1 = <T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>n
 >r12arg1 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 ><T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>null : <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
 ><Array<Derived>>null : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r12arg2 = (x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null;
 >r12arg2 : (x: Base[], y: Derived2[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -804,10 +804,10 @@ var r13arg1 = <T extends Array<Derived>>(x: Array<Base>, y: T) => y;
 >r13arg1 : <T extends Derived[]>(x: Base[], y: T) => T
 ><T extends Array<Derived>>(x: Array<Base>, y: T) => y : <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
@@ -817,13 +817,13 @@ var r13arg2 = (x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null;
 >r13arg2 : (x: Base[], y: Derived[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
 ><Array<Derived>>null : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 51dcee9445e..8c136113464 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -432,26 +432,26 @@ module Errors {
 >r6arg : (x: Base[], y: Derived2[]) => Derived[]
 >(x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     var r6arg2 = <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => <T>null;
 >r6arg2 : <T extends Derived2[]>(x: Base[], y: Base[]) => T
 ><T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => <T>null : <T extends Derived2[]>(x: Base[], y: Base[]) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 ><T>null : T
 >T : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 4f049eb4005..fdba6014751 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
@@ -713,25 +713,25 @@ var r11b = [r11arg2, r11arg1];
 var r12arg1: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>;
 >r12arg1 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r12arg2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r12arg2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -755,10 +755,10 @@ var r12b = [r12arg2, r12arg1];
 var r13arg1: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T;
 >r13arg1 : new <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
@@ -767,12 +767,12 @@ var r13arg1: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T;
 var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >r13arg2 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 15f7651b00d..cf4db8939fd 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -401,24 +401,24 @@ module Errors {
     var r6arg1: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     var r6arg2: new <T extends Array<Derived2>>(x: Array<Base>, y: Array<Base>) => T;
 >r6arg2 : new <T extends Derived2[]>(x: Base[], y: Base[]) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >T : T
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.types b/tests/baselines/reference/subtypingWithConstructSignatures5.types
index 3999609bc3d..7ffb4db5467 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array
+>Array : T[]
 >Derived2 : Derived2
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array
+>Array : T[]
 >Derived : Derived
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     a12: new <T extends Array<Base>>(x: Array<Base>, y: T) => Array<Derived>; // ok, less specific parameter type
 >a12 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 >T : T
->Array : Array
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 
     a13: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T; // ok, T = Array<Derived>, satisfies constraint, contextual signature instantiation succeeds
 >a13 : new <T extends Derived[]>(x: Base[], y: T) => T
 >T : T
->Array : Array
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/superCallArgsMustMatch.types b/tests/baselines/reference/superCallArgsMustMatch.types
index 26f831fd816..6f5637edd1a 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.types
+++ b/tests/baselines/reference/superCallArgsMustMatch.types
@@ -17,7 +17,7 @@ class T5<T>{
 
 class T6 extends T5<number>{
 >T6 : T6
->T5 : T5
+>T5 : T5<T>
 
     constructor() {
 
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
index 5b6482c240f..e125522bbb7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
@@ -6,17 +6,17 @@ declare class B<T> {
     m<U>(): B<U>;
 >m : <U>() => B<U>
 >U : U
->B : B
+>B : B<T>
 >U : U
 
     static g(): B<any>;
 >g : () => B<any>
->B : B
+>B : B<T>
 }
 
 class D extends B<any> {
 >D : D
->B : B
+>B : B<T>
 
     constructor() {
         super();
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
index 6c98937dfe7..0aa1487543f 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
@@ -6,13 +6,13 @@ declare class B<T> {
     m<U>(): B<U>;
 >m : <U>() => B<U>
 >U : U
->B : B
+>B : B<T>
 >U : U
 }
 
 class D extends B<any> {
 >D : D
->B : B
+>B : B<T>
 
     constructor() {
         super();
diff --git a/tests/baselines/reference/superWithGenericSpecialization.types b/tests/baselines/reference/superWithGenericSpecialization.types
index c24d64c017c..1b9190176e8 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.types
+++ b/tests/baselines/reference/superWithGenericSpecialization.types
@@ -11,7 +11,7 @@ class C<T> {
 class D<T> extends C<string> {
 >D : D<T>
 >T : T
->C : C
+>C : C<T>
 
     y: T;
 >y : T
@@ -25,7 +25,7 @@ class D<T> extends C<string> {
 
 var d: D<number>;
 >d : D<number>
->D : D
+>D : D<T>
 
 var r: string = d.x;
 >r : string
diff --git a/tests/baselines/reference/superWithGenerics.types b/tests/baselines/reference/superWithGenerics.types
index 00f660d2cc7..89086033284 100644
--- a/tests/baselines/reference/superWithGenerics.types
+++ b/tests/baselines/reference/superWithGenerics.types
@@ -6,17 +6,17 @@ declare class B<T> {
     m<U>(): B<U>;
 >m : <U>() => B<U>
 >U : U
->B : B
+>B : B<T>
 >U : U
 
     static g(): B<any>;
 >g : () => B<any>
->B : B
+>B : B<T>
 }
 
 class D extends B<any> {
 >D : D
->B : B
+>B : B<T>
 
     constructor() {
         super(); 
diff --git a/tests/baselines/reference/thisExpressionOfGenericObject.types b/tests/baselines/reference/thisExpressionOfGenericObject.types
index e7914b4217c..0a8e147f073 100644
--- a/tests/baselines/reference/thisExpressionOfGenericObject.types
+++ b/tests/baselines/reference/thisExpressionOfGenericObject.types
@@ -5,7 +5,7 @@ class MyClass1<T> {
 
     private obj: MyClass1<string>;
 >obj : MyClass1<string>
->MyClass1 : MyClass1
+>MyClass1 : MyClass1<T>
 
     constructor() {
         () => this;
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 112d8b8dd2a..42edde3080b 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -26,13 +26,13 @@ class D<T>{
 
     recurse: D<T>;
 >recurse : D<T>
->D : D
+>D : D<T>
 >T : T
 
     wrapped: D<D<T>>
 >wrapped : D<D<T>>
->D : D
->D : D
+>D : D<T>
+>D : D<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
index fc3ab754b9e..6c505f9b2a5 100644
--- a/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
+++ b/tests/baselines/reference/tooFewArgumentsInGenericFunctionTypedArgument.types
@@ -30,7 +30,7 @@ interface Combinators {
 >U : U
 >V : V
 >c : Collection<T, U>
->Collection : Collection
+>Collection : Collection<T, U>
 >T : T
 >U : U
 >f : (x: T, y: U) => V
@@ -39,7 +39,7 @@ interface Combinators {
 >y : U
 >U : U
 >V : V
->Collection : Collection
+>Collection : Collection<T, U>
 >T : T
 >V : V
 
@@ -48,7 +48,7 @@ interface Combinators {
 >T : T
 >U : U
 >c : Collection<T, U>
->Collection : Collection
+>Collection : Collection<T, U>
 >T : T
 >U : U
 >f : (x: T, y: U) => any
@@ -56,11 +56,11 @@ interface Combinators {
 >T : T
 >y : U
 >U : U
->Collection : Collection
+>Collection : Collection<T, U>
 }
 var c2: Collection<number, string>;
 >c2 : Collection<number, string>
->Collection : Collection
+>Collection : Collection<T, U>
 
 var _: Combinators;
 >_ : Combinators
diff --git a/tests/baselines/reference/transitiveTypeArgumentInference1.types b/tests/baselines/reference/transitiveTypeArgumentInference1.types
index 87b2d1461de..105f581c3e0 100644
--- a/tests/baselines/reference/transitiveTypeArgumentInference1.types
+++ b/tests/baselines/reference/transitiveTypeArgumentInference1.types
@@ -13,7 +13,7 @@ interface I1<T, U> {
 
 var i: I1<boolean, string> = null;
 >i : I1<boolean, string>
->I1 : I1
+>I1 : I1<T, U>
 
 class C<T> {
 >C : C<T>
@@ -21,7 +21,7 @@ class C<T> {
 
 	constructor(p: I1<boolean, T>) {
 >p : I1<boolean, T>
->I1 : I1
+>I1 : I1<T, U>
 >T : T
 	}
 }
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
index 9aaf4ad1dfc..9c4f8a0eb8c 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.types
@@ -55,7 +55,7 @@ interface B<T> {
 
 var b: B<boolean>;
 >b : B<boolean>
->B : B
+>B : B<T>
 
 var r = b.foo(true); // returns Date
 >r : Date
@@ -100,7 +100,7 @@ interface C<T, U> {
 
 var c: C<boolean, Date>;
 >c : C<boolean, Date>
->C : C
+>C : C<T, U>
 >Date : Date
 
 var r2 = c.foo(1, 2); // number
@@ -151,7 +151,7 @@ interface D<T, U> {
 
 var d: D<boolean, Date>;
 >d : D<boolean, Date>
->D : D
+>D : D<T, U>
 >Date : Date
 
 var r3 = d.foo(1, 1); // boolean, last definition wins
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
index f6a6d62e26e..46fa17d31a6 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
@@ -69,7 +69,7 @@ module G {
 
     var a: A<boolean>;
 >a : A<boolean>
->A : A
+>A : A<T>
 
     var r = a();
 >r : string
diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.types b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
index db431e318e8..d697b34f344 100644
--- a/tests/baselines/reference/typeInferenceReturnTypeCallback.types
+++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
@@ -10,14 +10,14 @@ interface IList<A> {
 >t : A
 >A : A
 >B : B
->IList : IList
+>IList : IList<A>
 >B : B
 }
 
 class Nil<C> implements IList<C>{
 >Nil : Nil<C>
 >C : C
->IList : IList
+>IList : IList<A>
 >C : C
 
     map<D>(f: (t: C) => D): IList<D> {
@@ -27,7 +27,7 @@ class Nil<C> implements IList<C>{
 >t : C
 >C : C
 >D : D
->IList : IList
+>IList : IList<A>
 >D : D
 
         return null;
@@ -37,7 +37,7 @@ class Nil<C> implements IList<C>{
 class Cons<T> implements IList<T>{
 >Cons : Cons<T>
 >T : T
->IList : IList
+>IList : IList<A>
 >T : T
 
     map<U>(f: (t: T) => U): IList<U> {
@@ -47,7 +47,7 @@ class Cons<T> implements IList<T>{
 >t : T
 >T : T
 >U : U
->IList : IList
+>IList : IList<A>
 >U : U
 
         return this.foldRight(new Nil<U>(), (t, acc) => {
diff --git a/tests/baselines/reference/typeLiteralCallback.types b/tests/baselines/reference/typeLiteralCallback.types
index ee82ee32c54..53715afe634 100644
--- a/tests/baselines/reference/typeLiteralCallback.types
+++ b/tests/baselines/reference/typeLiteralCallback.types
@@ -10,7 +10,7 @@ interface Foo<T> {
 }
 var foo: Foo<string>
 >foo : Foo<string>
->Foo : Foo
+>Foo : Foo<T>
 
 interface bar<T> {
 >bar : bar<T>
@@ -30,7 +30,7 @@ interface bar<T> {
 }
 var test: bar<string>;
 >test : bar<string>
->bar : bar
+>bar : bar<T>
 
 test.fail(arg => foo.reject(arg));
 >test.fail(arg => foo.reject(arg)) : void
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.types b/tests/baselines/reference/typeParameterAsTypeArgument.types
index f63a67a126a..5e0d5ba2437 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.types
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.types
@@ -42,7 +42,7 @@ interface I<T, U> {
 
     x: C<U, T>;
 >x : C<U, T>
->C : C
+>C : C<T, U>
 >U : U
 >T : T
 }
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
index 8c13a783bc3..cda63776bdb 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.types
@@ -23,10 +23,10 @@ interface B<T> {
 
 var a: A<string>
 >a : A<string>
->A : A
+>A : A<T>
 
 var b: B<string> = a; // assignment should be legal (both U's get instantiated to any for comparison)
 >b : B<string>
->B : B
+>B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
index e44c6b71a8d..fd0ad1890e8 100644
--- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
+++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter2.types
@@ -8,8 +8,8 @@ interface A<T> {
 >U : U
 >T : T
 >x : A<A<U>>
->A : A
->A : A
+>A : A<T>
+>A : A<T>
 >U : U
 }
 
@@ -22,17 +22,17 @@ interface B<T> {
 >U : U
 >T : T
 >x : B<B<U>>
->B : B
->B : B
+>B : B<T>
+>B : B<T>
 >U : U
 }
 
 var a: A<string>
 >a : A<string>
->A : A
+>A : A<T>
 
 var b: B<string> = a;
 >b : B<string>
->B : B
+>B : B<T>
 >a : A<string>
 
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index 6fe868c87f1..a62d6cc86f5 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -9,7 +9,7 @@ declare module _ {
     interface List<T> extends Collection<T> {
 >List : List<T>
 >T : T
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 
         [index: number]: T;
@@ -37,7 +37,7 @@ declare module _ {
     interface Dictionary<T> extends Collection<T> {
 >Dictionary : Dictionary<T>
 >T : T
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 
         [index: string]: T;
@@ -50,7 +50,7 @@ declare module _ {
 
         list: Collection<T>,
 >list : Collection<T>
->Collection : Collection
+>Collection : Collection<T>
 >T : T
 
         propertyName: string): any[];
@@ -63,12 +63,12 @@ declare module _ {
 
         list: List<T>,
 >list : List<T>
->List : List
+>List : List<T>
 >T : T
 
         iterator: ListIterator<T, TResult>,
 >iterator : ListIterator<T, TResult>
->ListIterator : ListIterator
+>ListIterator : ListIterator<T, TResult>
 >T : T
 >TResult : TResult
 
@@ -80,7 +80,7 @@ declare module _ {
 >first : <T>(array: List<T>) => T
 >T : T
 >array : List<T>
->List : List
+>List : List<T>
 >T : T
 >T : T
 }
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index c3b4588d38a..c32162b95a5 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1436,7 +1436,7 @@ interface Tuple2<T0, T1> extends Array<any> {
 >Tuple2 : Tuple2<T0, T1>
 >T0 : T0
 >T1 : T1
->Array : Array
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1450,7 +1450,7 @@ interface Tuple3<T0, T1, T2> extends Array<any> {
 >T0 : T0
 >T1 : T1
 >T2 : T2
->Array : Array
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1468,7 +1468,7 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 >T1 : T1
 >T2 : T2
 >T3 : T3
->Array : Array
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1602,7 +1602,7 @@ module Underscore {
 >WrappedFunction : WrappedFunction<T>
 >T : T
 >Function : Function
->WrappedObject : WrappedObject
+>WrappedObject : WrappedObject<T>
 >T : T
 
         bind(object: any): T;
@@ -1674,21 +1674,21 @@ module Underscore {
     export interface WrappedArray<T> extends WrappedObject<Array<T>> {
 >WrappedArray : WrappedArray<T>
 >T : T
->WrappedObject : WrappedObject
->Array : Array
+>WrappedObject : WrappedObject<T>
+>Array : T[]
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): void;
 >each : (iterator: Iterator<T, void>, context?: any) => void
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         forEach(iterator: Iterator<T, void>, context?: any): void;
 >forEach : (iterator: Iterator<T, void>, context?: any) => void
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -1696,7 +1696,7 @@ module Underscore {
 >map : <U>(iterator: Iterator<T, U>, context?: any) => U[]
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -1706,7 +1706,7 @@ module Underscore {
 >collect : <U>(iterator: Iterator<T, U>, context?: any) => U[]
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -1715,7 +1715,7 @@ module Underscore {
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -1727,7 +1727,7 @@ module Underscore {
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -1738,7 +1738,7 @@ module Underscore {
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -1750,7 +1750,7 @@ module Underscore {
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -1761,7 +1761,7 @@ module Underscore {
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -1773,7 +1773,7 @@ module Underscore {
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -1784,7 +1784,7 @@ module Underscore {
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -1796,7 +1796,7 @@ module Underscore {
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -1807,7 +1807,7 @@ module Underscore {
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -1819,7 +1819,7 @@ module Underscore {
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -1830,7 +1830,7 @@ module Underscore {
         find(iterator: Iterator<T, boolean>, context?: any): T;
 >find : (iterator: Iterator<T, boolean>, context?: any) => T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1838,7 +1838,7 @@ module Underscore {
         detect(iterator: Iterator<T, boolean>, context?: any): T;
 >detect : (iterator: Iterator<T, boolean>, context?: any) => T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1846,7 +1846,7 @@ module Underscore {
         filter(iterator: Iterator<T, boolean>, context?: any): T[];
 >filter : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1854,7 +1854,7 @@ module Underscore {
         select(iterator: Iterator<T, boolean>, context?: any): T[];
 >select : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1874,7 +1874,7 @@ module Underscore {
         reject(iterator: Iterator<T, boolean>, context?: any): T[];
 >reject : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1882,28 +1882,28 @@ module Underscore {
         every(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >every : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         all(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >all : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         some(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >some : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         any(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >any : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -1929,7 +1929,7 @@ module Underscore {
         max(iterator?: Iterator<T, any>, context?: any): T;
 >max : (iterator?: Iterator<T, any>, context?: any) => T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1937,7 +1937,7 @@ module Underscore {
         min(iterator?: Iterator<T, any>, context?: any): T;
 >min : (iterator?: Iterator<T, any>, context?: any) => T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1945,7 +1945,7 @@ module Underscore {
         sortBy(iterator: Iterator<T, any>, context?: any): T[];
 >sortBy : { (iterator: Iterator<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -1958,30 +1958,30 @@ module Underscore {
         groupBy(iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         groupBy(propertyName: string): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         countBy(iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         countBy(propertyName: string): Dictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         shuffle(): T[];
 >shuffle : () => T[]
@@ -2088,7 +2088,7 @@ module Underscore {
 >U : U
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -2104,7 +2104,7 @@ module Underscore {
 >U : U
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -2144,7 +2144,7 @@ module Underscore {
 >obj : T
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -2213,21 +2213,21 @@ module Underscore {
     export interface WrappedDictionary<T> extends WrappedObject<Dictionary<T>> {
 >WrappedDictionary : WrappedDictionary<T>
 >T : T
->WrappedObject : WrappedObject
->Dictionary : Dictionary
+>WrappedObject : WrappedObject<T>
+>Dictionary : Dictionary<T>
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): void;
 >each : (iterator: Iterator<T, void>, context?: any) => void
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         forEach(iterator: Iterator<T, void>, context?: any): void;
 >forEach : (iterator: Iterator<T, void>, context?: any) => void
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -2235,7 +2235,7 @@ module Underscore {
 >map : <U>(iterator: Iterator<T, U>, context?: any) => U[]
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -2245,7 +2245,7 @@ module Underscore {
 >collect : <U>(iterator: Iterator<T, U>, context?: any) => U[]
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -2254,7 +2254,7 @@ module Underscore {
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -2266,7 +2266,7 @@ module Underscore {
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -2277,7 +2277,7 @@ module Underscore {
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -2289,7 +2289,7 @@ module Underscore {
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -2300,7 +2300,7 @@ module Underscore {
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -2312,7 +2312,7 @@ module Underscore {
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -2323,7 +2323,7 @@ module Underscore {
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -2335,7 +2335,7 @@ module Underscore {
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -2346,7 +2346,7 @@ module Underscore {
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): T;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -2358,7 +2358,7 @@ module Underscore {
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -2369,7 +2369,7 @@ module Underscore {
         find(iterator: Iterator<T, boolean>, context?: any): T;
 >find : (iterator: Iterator<T, boolean>, context?: any) => T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2377,7 +2377,7 @@ module Underscore {
         detect(iterator: Iterator<T, boolean>, context?: any): T;
 >detect : (iterator: Iterator<T, boolean>, context?: any) => T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2385,7 +2385,7 @@ module Underscore {
         filter(iterator: Iterator<T, boolean>, context?: any): T[];
 >filter : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2393,7 +2393,7 @@ module Underscore {
         select(iterator: Iterator<T, boolean>, context?: any): T[];
 >select : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2413,7 +2413,7 @@ module Underscore {
         reject(iterator: Iterator<T, boolean>, context?: any): T[];
 >reject : (iterator: Iterator<T, boolean>, context?: any) => T[]
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2421,28 +2421,28 @@ module Underscore {
         every(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >every : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         all(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >all : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         some(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >some : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
         any(iterator?: Iterator<T, boolean>, context?: any): boolean;
 >any : (iterator?: Iterator<T, boolean>, context?: any) => boolean
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -2468,7 +2468,7 @@ module Underscore {
         max(iterator?: Iterator<T, any>, context?: any): T;
 >max : (iterator?: Iterator<T, any>, context?: any) => T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2476,7 +2476,7 @@ module Underscore {
         min(iterator?: Iterator<T, any>, context?: any): T;
 >min : (iterator?: Iterator<T, any>, context?: any) => T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2484,7 +2484,7 @@ module Underscore {
         sortBy(iterator: Iterator<T, any>, context?: any): T[];
 >sortBy : { (iterator: Iterator<T, any>, context?: any): T[]; (propertyName: string): T[]; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -2497,30 +2497,30 @@ module Underscore {
         groupBy(iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         groupBy(propertyName: string): Dictionary<T[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; (propertyName: string): Dictionary<T[]>; }
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         countBy(iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         countBy(propertyName: string): Dictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): Dictionary<number>; (propertyName: string): Dictionary<number>; }
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         shuffle(): T[];
 >shuffle : () => T[]
@@ -2540,55 +2540,55 @@ module Underscore {
 
         keys(): ChainedArray<string>;
 >keys : () => ChainedArray<string>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         values(): ChainedArray<any>;
 >values : () => ChainedArray<any>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         pairs(): ChainedArray<any[]>;
 >pairs : () => ChainedArray<any[]>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         invert(): ChainedObject<any>;
 >invert : () => ChainedObject<any>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         functions(): ChainedArray<string>;
 >functions : () => ChainedArray<string>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         methods(): ChainedArray<string>;
 >methods : () => ChainedArray<string>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         extend(...sources: any[]): ChainedObject<T>;
 >extend : (...sources: any[]) => ChainedObject<T>
 >sources : any[]
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         pick(...keys: string[]): ChainedObject<T>;
 >pick : (...keys: string[]) => ChainedObject<T>
 >keys : string[]
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         omit(...keys: string[]): ChainedObject<T>;
 >omit : (...keys: string[]) => ChainedObject<T>
 >keys : string[]
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         defaults(...defaults: any[]): ChainedObject<T>;
 >defaults : (...defaults: any[]) => ChainedObject<T>
 >defaults : any[]
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         clone(): ChainedObject<T>;
 >clone : () => ChainedObject<T>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         tap(interceptor: (object: T) => void): ChainedObject<T>;
@@ -2596,79 +2596,79 @@ module Underscore {
 >interceptor : (object: T) => void
 >object : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         has(key: string): ChainedObject<boolean>;
 >has : (key: string) => ChainedObject<boolean>
 >key : string
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isEqual(other: T): ChainedObject<boolean>;
 >isEqual : (other: T) => ChainedObject<boolean>
 >other : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isEmpty(): ChainedObject<boolean>;
 >isEmpty : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isElement(): ChainedObject<boolean>;
 >isElement : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isArray(): ChainedObject<boolean>;
 >isArray : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isObject(): ChainedObject<boolean>;
 >isObject : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isArguments(): ChainedObject<boolean>;
 >isArguments : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isFunction(): ChainedObject<boolean>;
 >isFunction : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isString(): ChainedObject<boolean>;
 >isString : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isNumber(): ChainedObject<boolean>;
 >isNumber : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isFinite(): ChainedObject<boolean>;
 >isFinite : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isBoolean(): ChainedObject<boolean>;
 >isBoolean : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isDate(): ChainedObject<boolean>;
 >isDate : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isRegExp(): ChainedObject<boolean>;
 >isRegExp : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isNaN(): ChainedObject<boolean>;
 >isNaN : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isNull(): ChainedObject<boolean>;
 >isNull : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         isUndefined(): ChainedObject<boolean>;
 >isUndefined : () => ChainedObject<boolean>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         value(): T;
 >value : () => T
@@ -2678,466 +2678,466 @@ module Underscore {
     export interface ChainedArray<T> extends ChainedObject<Array<T>> {
 >ChainedArray : ChainedArray<T>
 >T : T
->ChainedObject : ChainedObject
->Array : Array
+>ChainedObject : ChainedObject<T>
+>Array : T[]
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
 >each : (iterator: Iterator<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         forEach(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
 >forEach : (iterator: Iterator<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         map<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
 >map : <U>(iterator: Iterator<T, U>, context?: any) => ChainedArray<U>
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         collect<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
 >collect : <U>(iterator: Iterator<T, U>, context?: any) => ChainedArray<U>
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         find(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
 >find : (iterator: Iterator<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         detect(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
 >detect : (iterator: Iterator<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         filter(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >filter : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         select(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >select : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         where(properties: Object): ChainedArray<T>;
 >where : (properties: Object) => ChainedArray<T>
 >properties : Object
 >Object : Object
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         findWhere(properties: Object): ChainedObject<T>;
 >findWhere : (properties: Object) => ChainedObject<T>
 >properties : Object
 >Object : Object
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reject(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >reject : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         every(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >every : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         all(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >all : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         some(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >some : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         any(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >any : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         contains(value: T): ChainedObject<boolean>;
 >contains : (value: T) => ChainedObject<boolean>
 >value : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         include(value: T): ChainedObject<boolean>;
 >include : (value: T) => ChainedObject<boolean>
 >value : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
 >invoke : (methodName: string, ...args: any[]) => ChainedArray<any>
 >methodName : string
 >args : any[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         pluck(propertyName: string): ChainedArray<any>;
 >pluck : (propertyName: string) => ChainedArray<any>
 >propertyName : string
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         max(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
 >max : (iterator?: Iterator<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         min(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
 >min : (iterator?: Iterator<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         sortBy(iterator: Iterator<T, any>, context?: any): ChainedArray<T>;
 >sortBy : { (iterator: Iterator<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         sortBy(propertyName: string): ChainedArray<T>;
 >sortBy : { (iterator: Iterator<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >propertyName : string
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         countBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         countBy(propertyName: string): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         shuffle(): ChainedArray<T>;
 >shuffle : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         toArray(): ChainedArray<T>;
 >toArray : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         size(): ChainedObject<number>;
 >size : () => ChainedObject<number>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         first(): ChainedObject<T>;
 >first : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         first(count: number): ChainedArray<T>;
 >first : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         head(): ChainedObject<T>;
 >head : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         head(count: number): ChainedArray<T>;
 >head : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         take(): ChainedObject<T>;
 >take : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         take(count: number): ChainedArray<T>;
 >take : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         initial(): ChainedObject<T>;
 >initial : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         initial(count: number): ChainedArray<T>;
 >initial : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         last(): ChainedObject<T>;
 >last : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         last(count: number): ChainedArray<T>;
 >last : { (): ChainedObject<T>; (count: number): ChainedArray<T>; }
 >count : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         rest(index?: number): ChainedArray<T>;
 >rest : (index?: number) => ChainedArray<T>
 >index : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         compact(): ChainedArray<T>;
 >compact : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         flatten<U>(shallow?: boolean): ChainedArray<U>;
 >flatten : <U>(shallow?: boolean) => ChainedArray<U>
 >U : U
 >shallow : boolean
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         without(...values: T[]): ChainedArray<T>;
 >without : (...values: T[]) => ChainedArray<T>
 >values : T[]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         union(...arrays: T[][]): ChainedArray<T>;
 >union : (...arrays: T[][]) => ChainedArray<T>
 >arrays : T[][]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         intersection(...arrays: T[][]): ChainedArray<T>;
 >intersection : (...arrays: T[][]) => ChainedArray<T>
 >arrays : T[][]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         difference(...others: T[][]): ChainedArray<T>;
 >difference : (...others: T[][]) => ChainedArray<T>
 >others : T[][]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         uniq(isSorted?: boolean): ChainedArray<T>;
 >uniq : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>; }
 >isSorted : boolean
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         uniq<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
@@ -3145,17 +3145,17 @@ module Underscore {
 >U : U
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         unique(isSorted?: boolean): ChainedArray<T>;
 >unique : { (isSorted?: boolean): ChainedArray<T>; <U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>; }
 >isSorted : boolean
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         unique<U>(isSorted: boolean, iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
@@ -3163,97 +3163,97 @@ module Underscore {
 >U : U
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         zip(...arrays: any[][]): ChainedArray<any[]>;
 >zip : (...arrays: any[][]) => ChainedArray<any[]>
 >arrays : any[][]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         object(): ChainedObject<any>;
 >object : { (): ChainedObject<any>; (values: any[]): ChainedObject<any>; }
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         object(values: any[]): ChainedObject<any>;
 >object : { (): ChainedObject<any>; (values: any[]): ChainedObject<any>; }
 >values : any[]
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         indexOf(value: T, isSorted?: boolean): ChainedObject<number>;
 >indexOf : (value: T, isSorted?: boolean) => ChainedObject<number>
 >value : T
 >T : T
 >isSorted : boolean
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         lastIndexOf(value: T, fromIndex?: number): ChainedObject<number>;
 >lastIndexOf : (value: T, fromIndex?: number) => ChainedObject<number>
 >value : T
 >T : T
 >fromIndex : number
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         sortedIndex(obj: T, propertyName: string): ChainedObject<number>;
 >sortedIndex : { (obj: T, propertyName: string): ChainedObject<number>; (obj: T, iterator?: Iterator<T, any>, context?: any): ChainedObject<number>; }
 >obj : T
 >T : T
 >propertyName : string
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         sortedIndex(obj: T, iterator?: Iterator<T, any>, context?: any): ChainedObject<number>;
 >sortedIndex : { (obj: T, propertyName: string): ChainedObject<number>; (obj: T, iterator?: Iterator<T, any>, context?: any): ChainedObject<number>; }
 >obj : T
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         // Methods from Array
         concat(...items: T[]): ChainedArray<T>;
 >concat : (...items: T[]) => ChainedArray<T>
 >items : T[]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         join(separator?: string): ChainedObject<string>;
 >join : (separator?: string) => ChainedObject<string>
 >separator : string
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         pop(): ChainedObject<T>;
 >pop : () => ChainedObject<T>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         push(...items: T[]): ChainedObject<number>;
 >push : (...items: T[]) => ChainedObject<number>
 >items : T[]
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         reverse(): ChainedArray<T>;
 >reverse : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         shift(): ChainedObject<T>;
 >shift : () => ChainedObject<T>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         slice(start: number, end?: number): ChainedArray<T>;
 >slice : (start: number, end?: number) => ChainedArray<T>
 >start : number
 >end : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         sort(compareFn?: (a: T, b: T) => number): ChainedArray<T>;
@@ -3263,13 +3263,13 @@ module Underscore {
 >T : T
 >b : T
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         splice(start: number): ChainedArray<T>;
 >splice : { (start: number): ChainedArray<T>; (start: number, deleteCount: number, ...items: T[]): ChainedArray<T>; }
 >start : number
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         splice(start: number, deleteCount: number, ...items: T[]): ChainedArray<T>;
@@ -3278,43 +3278,43 @@ module Underscore {
 >deleteCount : number
 >items : T[]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         unshift(...items: T[]): ChainedObject<number>;
 >unshift : (...items: T[]) => ChainedObject<number>
 >items : T[]
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedArray<T>;
 >extend : (...sources: any[]) => ChainedArray<T>
 >sources : any[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         pick(...keys: string[]): ChainedArray<T>;
 >pick : (...keys: string[]) => ChainedArray<T>
 >keys : string[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         omit(...keys: string[]): ChainedArray<T>;
 >omit : (...keys: string[]) => ChainedArray<T>
 >keys : string[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         defaults(...defaults: any[]): ChainedArray<T>;
 >defaults : (...defaults: any[]) => ChainedArray<T>
 >defaults : any[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         clone(): ChainedArray<T>;
 >clone : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         tap(interceptor: (object: T[]) => void): ChainedArray<T>;
@@ -3322,405 +3322,405 @@ module Underscore {
 >interceptor : (object: T[]) => void
 >object : T[]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
     }
 
     export interface ChainedDictionary<T> extends ChainedObject<Dictionary<T>> {
 >ChainedDictionary : ChainedDictionary<T>
 >T : T
->ChainedObject : ChainedObject
->Dictionary : Dictionary
+>ChainedObject : ChainedObject<T>
+>Dictionary : Dictionary<T>
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
 >each : (iterator: Iterator<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         forEach(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
 >forEach : (iterator: Iterator<T, void>, context?: any) => ChainedObject<void>
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         map<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
 >map : <U>(iterator: Iterator<T, U>, context?: any) => ChainedArray<U>
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         collect<U>(iterator: Iterator<T, U>, context?: any): ChainedArray<U>;
 >collect : <U>(iterator: Iterator<T, U>, context?: any) => ChainedArray<U>
 >U : U
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >U : U
 
         reduce(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reduce<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduce : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         foldl(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         foldl<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldl : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         inject(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         inject<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >inject : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         reduceRight(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reduceRight<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >reduceRight : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         foldr(iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         foldr<U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>;
 >foldr : { (iterator: Reducer<T, T>, initialValue?: T, context?: any): ChainedObject<T>; <U>(iterator: Reducer<T, U>, initialValue: U, context?: any): ChainedObject<U>; }
 >U : U
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
 >U : U
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >U : U
 
         find(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
 >find : (iterator: Iterator<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         detect(iterator: Iterator<T, boolean>, context?: any): ChainedObject<T>;
 >detect : (iterator: Iterator<T, boolean>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         filter(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >filter : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         select(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >select : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         where(properties: Object): ChainedArray<T>;
 >where : (properties: Object) => ChainedArray<T>
 >properties : Object
 >Object : Object
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         findWhere(properties: Object): ChainedObject<T>;
 >findWhere : (properties: Object) => ChainedObject<T>
 >properties : Object
 >Object : Object
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         reject(iterator: Iterator<T, boolean>, context?: any): ChainedArray<T>;
 >reject : (iterator: Iterator<T, boolean>, context?: any) => ChainedArray<T>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         every(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >every : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         all(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >all : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         some(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >some : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         any(iterator?: Iterator<T, boolean>, context?: any): ChainedObject<boolean>;
 >any : (iterator?: Iterator<T, boolean>, context?: any) => ChainedObject<boolean>
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         contains(value: T): ChainedObject<boolean>;
 >contains : (value: T) => ChainedObject<boolean>
 >value : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         include(value: T): ChainedObject<boolean>;
 >include : (value: T) => ChainedObject<boolean>
 >value : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         invoke(methodName: string, ...args: any[]): ChainedArray<any>;
 >invoke : (methodName: string, ...args: any[]) => ChainedArray<any>
 >methodName : string
 >args : any[]
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         pluck(propertyName: string): ChainedArray<any>;
 >pluck : (propertyName: string) => ChainedArray<any>
 >propertyName : string
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 
         max(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
 >max : (iterator?: Iterator<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         min(iterator?: Iterator<T, any>, context?: any): ChainedObject<T>;
 >min : (iterator?: Iterator<T, any>, context?: any) => ChainedObject<T>
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         sortBy(iterator: Iterator<T, any>, context?: any): ChainedArray<T>;
 >sortBy : { (iterator: Iterator<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         sortBy(propertyName: string): ChainedArray<T>;
 >sortBy : { (iterator: Iterator<T, any>, context?: any): ChainedArray<T>; (propertyName: string): ChainedArray<T>; }
 >propertyName : string
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         // Should return ChainedDictionary<T[]>, but expansive recursion not allowed
         groupBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         groupBy(propertyName: string): ChainedDictionary<any[]>;
 >groupBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<any[]>; (propertyName: string): ChainedDictionary<any[]>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         countBy(iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         countBy(propertyName: string): ChainedDictionary<number>;
 >countBy : { (iterator?: Iterator<T, any>, context?: any): ChainedDictionary<number>; (propertyName: string): ChainedDictionary<number>; }
 >propertyName : string
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 
         shuffle(): ChainedArray<T>;
 >shuffle : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         toArray(): ChainedArray<T>;
 >toArray : () => ChainedArray<T>
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         size(): ChainedObject<number>;
 >size : () => ChainedObject<number>
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 
         // Methods from ChainedObject with promoted return types
         extend(...sources: any[]): ChainedDictionary<T>;
 >extend : (...sources: any[]) => ChainedDictionary<T>
 >sources : any[]
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         pick(...keys: string[]): ChainedDictionary<T>;
 >pick : (...keys: string[]) => ChainedDictionary<T>
 >keys : string[]
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         omit(...keys: string[]): ChainedDictionary<T>;
 >omit : (...keys: string[]) => ChainedDictionary<T>
 >keys : string[]
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         defaults(...defaults: any[]): ChainedDictionary<T>;
 >defaults : (...defaults: any[]) => ChainedDictionary<T>
 >defaults : any[]
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         clone(): ChainedDictionary<T>;
 >clone : () => ChainedDictionary<T>
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         tap(interceptor: (object: Dictionary<T>) => void): ChainedDictionary<T>;
 >tap : (interceptor: (object: Dictionary<T>) => void) => ChainedDictionary<T>
 >interceptor : (object: Dictionary<T>) => void
 >object : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
     }
 
@@ -3747,15 +3747,15 @@ module Underscore {
 >T : T
 >list : T[]
 >T : T
->WrappedArray : WrappedArray
+>WrappedArray : WrappedArray<T>
 >T : T
 
         <T>(list: Dictionary<T>): WrappedDictionary<T>;
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
->WrappedDictionary : WrappedDictionary
+>WrappedDictionary : WrappedDictionary<T>
 >T : T
 
         <T extends Function>(func: T): WrappedFunction<T>;
@@ -3763,14 +3763,14 @@ module Underscore {
 >Function : Function
 >func : T
 >T : T
->WrappedFunction : WrappedFunction
+>WrappedFunction : WrappedFunction<T>
 >T : T
 
         <T>(obj: T): WrappedObject<T>;
 >T : T
 >obj : T
 >T : T
->WrappedObject : WrappedObject
+>WrappedObject : WrappedObject<T>
 >T : T
 
         chain<T>(list: T[]): ChainedArray<T>;
@@ -3778,16 +3778,16 @@ module Underscore {
 >T : T
 >list : T[]
 >T : T
->ChainedArray : ChainedArray
+>ChainedArray : ChainedArray<T>
 >T : T
 
         chain<T>(list: Dictionary<T>): ChainedDictionary<T>;
 >chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
->ChainedDictionary : ChainedDictionary
+>ChainedDictionary : ChainedDictionary<T>
 >T : T
 
         chain<T>(obj: T): ChainedObject<T>;
@@ -3795,7 +3795,7 @@ module Underscore {
 >T : T
 >obj : T
 >T : T
->ChainedObject : ChainedObject
+>ChainedObject : ChainedObject<T>
 >T : T
 
         each<T>(list: T[], iterator: Iterator<T, void>, context?: any): void;
@@ -3804,7 +3804,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -3812,10 +3812,10 @@ module Underscore {
 >each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -3825,7 +3825,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -3833,10 +3833,10 @@ module Underscore {
 >forEach : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, void>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -3847,7 +3847,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -3858,10 +3858,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -3874,7 +3874,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -3885,10 +3885,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -3900,7 +3900,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -3915,7 +3915,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -3927,10 +3927,10 @@ module Underscore {
 >reduce : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -3943,10 +3943,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -3960,7 +3960,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -3975,7 +3975,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -3987,10 +3987,10 @@ module Underscore {
 >foldl : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4003,10 +4003,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4020,7 +4020,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4035,7 +4035,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4047,10 +4047,10 @@ module Underscore {
 >inject : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4063,10 +4063,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4080,7 +4080,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4095,7 +4095,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4107,10 +4107,10 @@ module Underscore {
 >reduceRight : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4123,10 +4123,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4140,7 +4140,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4155,7 +4155,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4167,10 +4167,10 @@ module Underscore {
 >foldr : { <T>(list: T[], iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: T[], iterator: Reducer<T, U>, initialValue: U, context?: any): U; <T>(list: Dictionary<T>, iterator: Reducer<T, T>, initialValue?: T, context?: any): T; <T, U>(list: Dictionary<T>, iterator: Reducer<T, U>, initialValue: U, context?: any): U; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, T>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >T : T
 >initialValue : T
@@ -4183,10 +4183,10 @@ module Underscore {
 >T : T
 >U : U
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Reducer<T, U>
->Reducer : Reducer
+>Reducer : Reducer<T, U>
 >T : T
 >U : U
 >initialValue : U
@@ -4200,7 +4200,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4209,10 +4209,10 @@ module Underscore {
 >find : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4223,7 +4223,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4232,10 +4232,10 @@ module Underscore {
 >detect : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4246,7 +4246,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4255,10 +4255,10 @@ module Underscore {
 >filter : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4269,7 +4269,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4278,10 +4278,10 @@ module Underscore {
 >select : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4299,7 +4299,7 @@ module Underscore {
 >where : { <T>(list: T[], properties: Object): T[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >properties : Object
 >Object : Object
@@ -4318,7 +4318,7 @@ module Underscore {
 >findWhere : { <T>(list: T[], properties: Object): T; <T>(list: Dictionary<T>, properties: Object): T; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >properties : Object
 >Object : Object
@@ -4330,7 +4330,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4339,10 +4339,10 @@ module Underscore {
 >reject : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4353,7 +4353,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4361,10 +4361,10 @@ module Underscore {
 >every : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4374,7 +4374,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4382,10 +4382,10 @@ module Underscore {
 >all : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4395,7 +4395,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4403,10 +4403,10 @@ module Underscore {
 >some : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4416,7 +4416,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4424,10 +4424,10 @@ module Underscore {
 >any : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, boolean>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -4443,7 +4443,7 @@ module Underscore {
 >contains : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >value : T
 >T : T
@@ -4460,7 +4460,7 @@ module Underscore {
 >include : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >value : T
 >T : T
@@ -4474,7 +4474,7 @@ module Underscore {
         invoke(list: Dictionary<any>, methodName: string, ...args: any[]): any[];
 >invoke : { (list: any[], methodName: string, ...args: any[]): any[]; (list: Dictionary<any>, methodName: string, ...args: any[]): any[]; }
 >list : Dictionary<any>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >methodName : string
 >args : any[]
 
@@ -4486,7 +4486,7 @@ module Underscore {
         pluck(list: Dictionary<any>, propertyName: string): any[];
 >pluck : { (list: any[], propertyName: string): any[]; (list: Dictionary<any>, propertyName: string): any[]; }
 >list : Dictionary<any>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >propertyName : string
 
         max<T>(list: T[], iterator?: Iterator<T, any>, context?: any): T;
@@ -4495,7 +4495,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4504,10 +4504,10 @@ module Underscore {
 >max : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4518,7 +4518,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4527,10 +4527,10 @@ module Underscore {
 >min : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4541,7 +4541,7 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4550,10 +4550,10 @@ module Underscore {
 >sortBy : { <T>(list: T[], iterator: Iterator<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 >T : T
@@ -4570,7 +4570,7 @@ module Underscore {
 >sortBy : { <T>(list: T[], iterator: Iterator<T, any>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, any>, context?: any): T[]; <T>(list: T[], propertyName: string): T[]; <T>(list: Dictionary<T>, propertyName: string): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >propertyName : string
 >T : T
@@ -4581,23 +4581,23 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         groupBy<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         groupBy<T>(list: T[], propertyName: string): Dictionary<T[]>;
@@ -4606,17 +4606,17 @@ module Underscore {
 >list : T[]
 >T : T
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         groupBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>;
 >groupBy : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<T[]>; <T>(list: T[], propertyName: string): Dictionary<T[]>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<T[]>; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         countBy<T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
@@ -4625,22 +4625,22 @@ module Underscore {
 >list : T[]
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         countBy<T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         countBy<T>(list: T[], propertyName: string): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
@@ -4648,16 +4648,16 @@ module Underscore {
 >list : T[]
 >T : T
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         countBy<T>(list: Dictionary<T>, propertyName: string): Dictionary<number>;
 >countBy : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): Dictionary<number>; <T>(list: T[], propertyName: string): Dictionary<number>; <T>(list: Dictionary<T>, propertyName: string): Dictionary<number>; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >propertyName : string
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 
         shuffle<T>(list: T[]): T[];
 >shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
@@ -4670,7 +4670,7 @@ module Underscore {
 >shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >T : T
 
@@ -4685,7 +4685,7 @@ module Underscore {
 >toArray : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 >T : T
 
@@ -4699,7 +4699,7 @@ module Underscore {
 >size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
 >T : T
 >list : Dictionary<T>
->Dictionary : Dictionary
+>Dictionary : Dictionary<T>
 >T : T
 
         first<T>(list: T[]): T;
@@ -4854,7 +4854,7 @@ module Underscore {
 >T : T
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -4876,7 +4876,7 @@ module Underscore {
 >T : T
 >isSorted : boolean
 >iterator : Iterator<T, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >U : U
 >context : any
@@ -4890,7 +4890,7 @@ module Underscore {
 >T0 : T0
 >a1 : T1[]
 >T1 : T1
->Tuple2 : Tuple2
+>Tuple2 : Tuple2<T0, T1>
 >T0 : T0
 >T1 : T1
 
@@ -4905,7 +4905,7 @@ module Underscore {
 >T1 : T1
 >a2 : T2[]
 >T2 : T2
->Tuple3 : Tuple3
+>Tuple3 : Tuple3<T0, T1, T2>
 >T0 : T0
 >T1 : T1
 >T2 : T2
@@ -4924,7 +4924,7 @@ module Underscore {
 >T2 : T2
 >a3 : T3[]
 >T3 : T3
->Tuple4 : Tuple4
+>Tuple4 : Tuple4<T0, T1, T2, T3>
 >T0 : T0
 >T1 : T1
 >T2 : T2
@@ -4978,7 +4978,7 @@ module Underscore {
 >obj : T
 >T : T
 >iterator : Iterator<T, any>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >T : T
 >context : any
 
@@ -5263,7 +5263,7 @@ module Underscore {
 >U : U
 >n : number
 >iterator : Iterator<number, U>
->Iterator : Iterator
+>Iterator : Iterator<T, U>
 >U : U
 >context : any
 >U : U
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index 8cc3956cd51..0f95301da7f 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -4,7 +4,7 @@ import B = require("unusedImportDeclaration_testerB");
 
 var thingy: B = {
 >thingy : TesterB
->B : B
+>B : TesterB
 >{
     me: "A"
 } : { me: string; }