diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index e5727d0c48c..ef2f2827066 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -487,7 +487,7 @@ namespace ts {
             // Depending on what kind of node this is, we may have to adjust the current container
             // and block-container.   If the current node is a container, then it is automatically
             // considered the current block-container as well.  Also, for containers that we know
-            // may contain locals, we proactively initialize the .locals field. We do this because
+            // may contain locals, we eagerly initialize the .locals field. We do this because
             // it's highly likely that the .locals will be needed to place some child in (for example,
             // a parameter, or variable declaration).
             //
@@ -593,20 +593,25 @@ namespace ts {
             }
         }
 
-        function bindEach(nodes: NodeArray<Node>) {
+        function bindEachFunctionsFirst(nodes: NodeArray<Node>) {
+            bindEach(nodes, n => n.kind === SyntaxKind.FunctionDeclaration ? bind(n) : undefined);
+            bindEach(nodes, n => n.kind !== SyntaxKind.FunctionDeclaration ? bind(n) : undefined);
+        }
+
+        function bindEach(nodes: NodeArray<Node>, bindFunction = bind) {
             if (nodes === undefined) {
                 return;
             }
 
             if (skipTransformFlagAggregation) {
-                forEach(nodes, bind);
+                forEach(nodes, bindFunction);
             }
             else {
                 const savedSubtreeTransformFlags = subtreeTransformFlags;
                 subtreeTransformFlags = TransformFlags.None;
                 let nodeArrayFlags = TransformFlags.None;
                 for (const node of nodes) {
-                    bind(node);
+                    bindFunction(node);
                     nodeArrayFlags |= node.transformFlags & ~TransformFlags.HasComputedFlags;
                 }
                 nodes.transformFlags = nodeArrayFlags | TransformFlags.HasComputedFlags;
@@ -706,6 +711,15 @@ namespace ts {
                 case SyntaxKind.JSDocTypedefTag:
                     bindJSDocTypedefTag(<JSDocTypedefTag>node);
                     break;
+                // In source files and blocks, bind functions first to match hoisting that occurs at runtime
+                case SyntaxKind.SourceFile:
+                    bindEachFunctionsFirst((node as SourceFile).statements);
+                    bind((node as SourceFile).endOfFileToken);
+                    break;
+                case SyntaxKind.Block:
+                case SyntaxKind.ModuleBlock:
+                    bindEachFunctionsFirst((node as Block).statements);
+                    break;
                 default:
                     bindEachChild(node);
                     break;
diff --git a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols
index 84d2f4be3dc..2753c04b7b0 100644
--- a/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols
+++ b/tests/baselines/reference/ModuleAndFunctionWithSameNameAndCommonRoot.symbols
@@ -31,7 +31,7 @@ module B {
 >B : Symbol(B, Decl(simple.ts, 0, 0))
 
     export module Point {
->Point : Symbol(Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5))
+>Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 10))
 
         export var Origin = { x: 0, y: 0 };
 >Origin : Symbol(Origin, Decl(simple.ts, 3, 18))
@@ -41,7 +41,7 @@ module B {
 
     // duplicate identifier error
     export function Point() {
->Point : Symbol(Point, Decl(simple.ts, 0, 10), Decl(simple.ts, 4, 5))
+>Point : Symbol(Point, Decl(simple.ts, 4, 5), Decl(simple.ts, 0, 10))
 
         return { x: 0, y: 0 };
 >x : Symbol(x, Decl(simple.ts, 8, 16))
diff --git a/tests/baselines/reference/ambientFundule.symbols b/tests/baselines/reference/ambientFundule.symbols
index e7e2c5a4a4d..d1775c7c0f9 100644
--- a/tests/baselines/reference/ambientFundule.symbols
+++ b/tests/baselines/reference/ambientFundule.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/ambientFundule.ts ===
 declare function f();
->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 0, 21), Decl(ambientFundule.ts, 1, 26))
+>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21))
 
 declare module f { var x }
->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 0, 21), Decl(ambientFundule.ts, 1, 26))
+>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21))
 >x : Symbol(x, Decl(ambientFundule.ts, 1, 22))
 
 declare function f(x);
->f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 0, 21), Decl(ambientFundule.ts, 1, 26))
+>f : Symbol(f, Decl(ambientFundule.ts, 0, 0), Decl(ambientFundule.ts, 1, 26), Decl(ambientFundule.ts, 0, 21))
 >x : Symbol(x, Decl(ambientFundule.ts, 2, 19))
 
diff --git a/tests/baselines/reference/augmentedTypesModules.symbols b/tests/baselines/reference/augmentedTypesModules.symbols
index 70ab734c9a6..1a0d6cc8ff7 100644
--- a/tests/baselines/reference/augmentedTypesModules.symbols
+++ b/tests/baselines/reference/augmentedTypesModules.symbols
@@ -42,24 +42,24 @@ var m1d = 1; // error
 
 // module then function
 module m2 { }
->m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 18, 12), Decl(augmentedTypesModules.ts, 21, 13))
+>m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 13), Decl(augmentedTypesModules.ts, 18, 12))
 
 function m2() { }; // ok since the module is not instantiated
->m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 18, 12), Decl(augmentedTypesModules.ts, 21, 13))
+>m2 : Symbol(m2, Decl(augmentedTypesModules.ts, 21, 13), Decl(augmentedTypesModules.ts, 18, 12))
 
 module m2a { var y = 2; }
->m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 22, 18), Decl(augmentedTypesModules.ts, 24, 25))
+>m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 25), Decl(augmentedTypesModules.ts, 22, 18))
 >y : Symbol(y, Decl(augmentedTypesModules.ts, 24, 16))
 
 function m2a() { }; // error since the module is instantiated
->m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 22, 18), Decl(augmentedTypesModules.ts, 24, 25))
+>m2a : Symbol(m2a, Decl(augmentedTypesModules.ts, 24, 25), Decl(augmentedTypesModules.ts, 22, 18))
 
 module m2b { export var y = 2; }
->m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 25, 19), Decl(augmentedTypesModules.ts, 27, 32))
+>m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 32), Decl(augmentedTypesModules.ts, 25, 19))
 >y : Symbol(y, Decl(augmentedTypesModules.ts, 27, 23))
 
 function m2b() { };  // error since the module is instantiated
->m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 25, 19), Decl(augmentedTypesModules.ts, 27, 32))
+>m2b : Symbol(m2b, Decl(augmentedTypesModules.ts, 27, 32), Decl(augmentedTypesModules.ts, 25, 19))
 
 // should be errors to have function first
 function m2c() { }; 
@@ -70,10 +70,10 @@ module m2c { export var y = 2; }
 >y : Symbol(y, Decl(augmentedTypesModules.ts, 32, 23))
 
 module m2d { }
->m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 32, 32), Decl(augmentedTypesModules.ts, 34, 14))
+>m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 14), Decl(augmentedTypesModules.ts, 32, 32))
 
 declare function m2d(): void; 
->m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 32, 32), Decl(augmentedTypesModules.ts, 34, 14))
+>m2d : Symbol(m2d, Decl(augmentedTypesModules.ts, 34, 14), Decl(augmentedTypesModules.ts, 32, 32))
 
 declare function m2e(): void; 
 >m2e : Symbol(m2e, Decl(augmentedTypesModules.ts, 35, 29), Decl(augmentedTypesModules.ts, 37, 29))
diff --git a/tests/baselines/reference/augmentedTypesModules2.symbols b/tests/baselines/reference/augmentedTypesModules2.symbols
index 79d6bff4d50..2d64e711c6a 100644
--- a/tests/baselines/reference/augmentedTypesModules2.symbols
+++ b/tests/baselines/reference/augmentedTypesModules2.symbols
@@ -1,24 +1,24 @@
 === tests/cases/compiler/augmentedTypesModules2.ts ===
 // module then function
 module m2 { }
->m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 0, 0), Decl(augmentedTypesModules2.ts, 1, 13))
+>m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 13), Decl(augmentedTypesModules2.ts, 0, 0))
 
 function m2() { }; // ok since the module is not instantiated
->m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 0, 0), Decl(augmentedTypesModules2.ts, 1, 13))
+>m2 : Symbol(m2, Decl(augmentedTypesModules2.ts, 1, 13), Decl(augmentedTypesModules2.ts, 0, 0))
 
 module m2a { var y = 2; }
->m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 2, 18), Decl(augmentedTypesModules2.ts, 4, 25))
+>m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 25), Decl(augmentedTypesModules2.ts, 2, 18))
 >y : Symbol(y, Decl(augmentedTypesModules2.ts, 4, 16))
 
 function m2a() { }; // error since the module is instantiated
->m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 2, 18), Decl(augmentedTypesModules2.ts, 4, 25))
+>m2a : Symbol(m2a, Decl(augmentedTypesModules2.ts, 4, 25), Decl(augmentedTypesModules2.ts, 2, 18))
 
 module m2b { export var y = 2; }
->m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 5, 19), Decl(augmentedTypesModules2.ts, 7, 32))
+>m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 32), Decl(augmentedTypesModules2.ts, 5, 19))
 >y : Symbol(y, Decl(augmentedTypesModules2.ts, 7, 23))
 
 function m2b() { };  // error since the module is instantiated
->m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 5, 19), Decl(augmentedTypesModules2.ts, 7, 32))
+>m2b : Symbol(m2b, Decl(augmentedTypesModules2.ts, 7, 32), Decl(augmentedTypesModules2.ts, 5, 19))
 
 function m2c() { }; 
 >m2c : Symbol(m2c, Decl(augmentedTypesModules2.ts, 8, 19), Decl(augmentedTypesModules2.ts, 10, 19))
@@ -28,17 +28,17 @@ module m2c { export var y = 2; }
 >y : Symbol(y, Decl(augmentedTypesModules2.ts, 11, 23))
 
 module m2cc { export var y = 2; }
->m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 11, 32), Decl(augmentedTypesModules2.ts, 13, 33))
+>m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 33), Decl(augmentedTypesModules2.ts, 11, 32))
 >y : Symbol(y, Decl(augmentedTypesModules2.ts, 13, 24))
 
 function m2cc() { }; // error to have module first
->m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 11, 32), Decl(augmentedTypesModules2.ts, 13, 33))
+>m2cc : Symbol(m2cc, Decl(augmentedTypesModules2.ts, 13, 33), Decl(augmentedTypesModules2.ts, 11, 32))
 
 module m2d { }
->m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 14, 20), Decl(augmentedTypesModules2.ts, 16, 14))
+>m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 14), Decl(augmentedTypesModules2.ts, 14, 20))
 
 declare function m2d(): void; 
->m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 14, 20), Decl(augmentedTypesModules2.ts, 16, 14))
+>m2d : Symbol(m2d, Decl(augmentedTypesModules2.ts, 16, 14), Decl(augmentedTypesModules2.ts, 14, 20))
 
 declare function m2e(): void; 
 >m2e : Symbol(m2e, Decl(augmentedTypesModules2.ts, 17, 29), Decl(augmentedTypesModules2.ts, 19, 29))
diff --git a/tests/baselines/reference/callOverloads1.errors.txt b/tests/baselines/reference/callOverloads1.errors.txt
index 64927462104..ea29698159d 100644
--- a/tests/baselines/reference/callOverloads1.errors.txt
+++ b/tests/baselines/reference/callOverloads1.errors.txt
@@ -1,10 +1,11 @@
 tests/cases/compiler/callOverloads1.ts(1,7): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads1.ts(9,10): error TS2300: Duplicate identifier 'Foo'.
 tests/cases/compiler/callOverloads1.ts(9,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
+tests/cases/compiler/callOverloads1.ts(13,10): error TS2350: Only a void function can be called with the 'new' keyword.
+tests/cases/compiler/callOverloads1.ts(13,10): error TS2554: Expected 0 arguments, but got 1.
 
 
-==== tests/cases/compiler/callOverloads1.ts (4 errors) ====
+==== tests/cases/compiler/callOverloads1.ts (5 errors) ====
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
@@ -24,9 +25,11 @@ tests/cases/compiler/callOverloads1.ts(17,1): error TS2348: Value of type 'typeo
     function F1(a:any) { return a;}
     
     var f1 = new Foo("hey");
+             ~~~~~~~~~~~~~~
+!!! error TS2350: Only a void function can be called with the 'new' keyword.
+             ~~~~~~~~~~~~~~
+!!! error TS2554: Expected 0 arguments, but got 1.
     
     
     f1.bar1();
-    Foo();
-    ~~~~~
-!!! error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
\ No newline at end of file
+    Foo();
\ No newline at end of file
diff --git a/tests/baselines/reference/callOverloads1.symbols b/tests/baselines/reference/callOverloads1.symbols
index 569e9dd024d..aadfcd4c06e 100644
--- a/tests/baselines/reference/callOverloads1.symbols
+++ b/tests/baselines/reference/callOverloads1.symbols
@@ -26,14 +26,12 @@ function F1(a:any) { return a;}
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads1.ts, 12, 3))
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1))
 
 
 f1.bar1();
->f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads1.ts, 0, 11))
 >f1 : Symbol(f1, Decl(callOverloads1.ts, 12, 3))
->bar1 : Symbol(Foo.bar1, Decl(callOverloads1.ts, 0, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads1.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads1.ts, 6, 1))
 
diff --git a/tests/baselines/reference/callOverloads1.types b/tests/baselines/reference/callOverloads1.types
index 4352f0eb6b3..0eb8284d257 100644
--- a/tests/baselines/reference/callOverloads1.types
+++ b/tests/baselines/reference/callOverloads1.types
@@ -25,19 +25,19 @@ function F1(a:any) { return a;}
 >a : any
 
 var f1 = new Foo("hey");
->f1 : Foo
->new Foo("hey") : Foo
->Foo : typeof Foo
+>f1 : any
+>new Foo("hey") : any
+>Foo : () => any
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : void
->f1.bar1 : () => void
->f1 : Foo
->bar1 : () => void
+>f1.bar1() : any
+>f1.bar1 : any
+>f1 : any
+>bar1 : any
 
 Foo();
 >Foo() : any
->Foo : typeof Foo
+>Foo : () => any
 
diff --git a/tests/baselines/reference/callOverloads2.errors.txt b/tests/baselines/reference/callOverloads2.errors.txt
index d49dc144157..34927375877 100644
--- a/tests/baselines/reference/callOverloads2.errors.txt
+++ b/tests/baselines/reference/callOverloads2.errors.txt
@@ -4,10 +4,11 @@ tests/cases/compiler/callOverloads2.ts(11,10): error TS2389: Function implementa
 tests/cases/compiler/callOverloads2.ts(11,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/callOverloads2.ts(12,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/callOverloads2.ts(14,10): error TS2391: Function implementation is missing or not immediately following the declaration.
-tests/cases/compiler/callOverloads2.ts(22,1): error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
+tests/cases/compiler/callOverloads2.ts(18,10): error TS2350: Only a void function can be called with the 'new' keyword.
+tests/cases/compiler/callOverloads2.ts(18,10): error TS2554: Expected 0 arguments, but got 1.
 
 
-==== tests/cases/compiler/callOverloads2.ts (7 errors) ====
+==== tests/cases/compiler/callOverloads2.ts (8 errors) ====
     class Foo { // error
           ~~~
 !!! error TS2300: Duplicate identifier 'Foo'.
@@ -38,10 +39,12 @@ tests/cases/compiler/callOverloads2.ts(22,1): error TS2348: Value of type 'typeo
     declare function Gar(s:String); // expect no error
     
     var f1 = new Foo("hey");
+             ~~~~~~~~~~~~~~
+!!! error TS2350: Only a void function can be called with the 'new' keyword.
+             ~~~~~~~~~~~~~~
+!!! error TS2554: Expected 0 arguments, but got 1.
     
     
     f1.bar1();
     Foo();
-    ~~~~~
-!!! error TS2348: Value of type 'typeof Foo' is not callable. Did you mean to include 'new'?
     
\ No newline at end of file
diff --git a/tests/baselines/reference/callOverloads2.symbols b/tests/baselines/reference/callOverloads2.symbols
index 41e5bbff711..972e1592826 100644
--- a/tests/baselines/reference/callOverloads2.symbols
+++ b/tests/baselines/reference/callOverloads2.symbols
@@ -36,14 +36,12 @@ declare function Gar(s:String); // expect no error
 
 var f1 = new Foo("hey");
 >f1 : Symbol(f1, Decl(callOverloads2.ts, 17, 3))
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1))
 
 
 f1.bar1();
->f1.bar1 : Symbol(Foo.bar1, Decl(callOverloads2.ts, 0, 11))
 >f1 : Symbol(f1, Decl(callOverloads2.ts, 17, 3))
->bar1 : Symbol(Foo.bar1, Decl(callOverloads2.ts, 0, 11))
 
 Foo();
->Foo : Symbol(Foo, Decl(callOverloads2.ts, 0, 0))
+>Foo : Symbol(Foo, Decl(callOverloads2.ts, 6, 1))
 
diff --git a/tests/baselines/reference/callOverloads2.types b/tests/baselines/reference/callOverloads2.types
index 5c8e68f29cd..1d1b4b3370b 100644
--- a/tests/baselines/reference/callOverloads2.types
+++ b/tests/baselines/reference/callOverloads2.types
@@ -35,19 +35,19 @@ declare function Gar(s:String); // expect no error
 >String : String
 
 var f1 = new Foo("hey");
->f1 : Foo
->new Foo("hey") : Foo
->Foo : typeof Foo
+>f1 : any
+>new Foo("hey") : any
+>Foo : () => any
 >"hey" : "hey"
 
 
 f1.bar1();
->f1.bar1() : void
->f1.bar1 : () => void
->f1 : Foo
->bar1 : () => void
+>f1.bar1() : any
+>f1.bar1 : any
+>f1 : any
+>bar1 : any
 
 Foo();
 >Foo() : any
->Foo : typeof Foo
+>Foo : () => any
 
diff --git a/tests/baselines/reference/complexRecursiveCollections.symbols b/tests/baselines/reference/complexRecursiveCollections.symbols
index 1452a3033dc..4f1a675edaf 100644
--- a/tests/baselines/reference/complexRecursiveCollections.symbols
+++ b/tests/baselines/reference/complexRecursiveCollections.symbols
@@ -169,10 +169,10 @@ declare module Immutable {
 >reviver : Symbol(reviver, Decl(immutable.ts, 4, 38))
 >key : Symbol(key, Decl(immutable.ts, 4, 50))
 >sequence : Symbol(sequence, Decl(immutable.ts, 4, 71))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >path : Symbol(path, Decl(immutable.ts, 4, 138))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 
@@ -189,36 +189,36 @@ declare module Immutable {
 >isImmutable : Symbol(isImmutable, Decl(immutable.ts, 6, 43))
 >maybeImmutable : Symbol(maybeImmutable, Decl(immutable.ts, 7, 30))
 >maybeImmutable : Symbol(maybeImmutable, Decl(immutable.ts, 7, 30))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
   export function isCollection(maybeCollection: any): maybeCollection is Collection<any, any>;
 >isCollection : Symbol(isCollection, Decl(immutable.ts, 7, 91))
 >maybeCollection : Symbol(maybeCollection, Decl(immutable.ts, 8, 31))
 >maybeCollection : Symbol(maybeCollection, Decl(immutable.ts, 8, 31))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
   export function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed<any, any>;
 >isKeyed : Symbol(isKeyed, Decl(immutable.ts, 8, 94))
 >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 9, 26))
 >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 9, 26))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 
   export function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed<any>;
 >isIndexed : Symbol(isIndexed, Decl(immutable.ts, 9, 85))
 >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 10, 28))
 >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 10, 28))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
   export function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed<any, any> | Collection.Indexed<any>;
 >isAssociative : Symbol(isAssociative, Decl(immutable.ts, 10, 88))
 >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 11, 32))
 >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 11, 32))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
   export function isOrdered(maybeOrdered: any): boolean;
 >isOrdered : Symbol(isOrdered, Decl(immutable.ts, 11, 129))
@@ -241,13 +241,13 @@ declare module Immutable {
 >hashCode : Symbol(ValueObject.hashCode, Decl(immutable.ts, 15, 32))
   }
   export module List {
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 
     function isList(maybeList: any): maybeList is List<any>;
 >isList : Symbol(isList, Decl(immutable.ts, 18, 22))
 >maybeList : Symbol(maybeList, Decl(immutable.ts, 19, 20))
 >maybeList : Symbol(maybeList, Decl(immutable.ts, 19, 20))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 
     function of<T>(...values: Array<T>): List<T>;
 >of : Symbol(of, Decl(immutable.ts, 19, 60))
@@ -255,34 +255,34 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 20, 19))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 20, 16))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 20, 16))
   }
   export function List(): List<any>;
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 
   export function List<T>(): List<T>;
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 23, 23))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 23, 23))
 
   export function List<T>(collection: Iterable<T>): List<T>;
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 24, 23))
 >collection : Symbol(collection, Decl(immutable.ts, 24, 26))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 24, 23))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 24, 23))
 
   export interface List<T> extends Collection.Indexed<T> {
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     // Persistent changes
@@ -291,19 +291,19 @@ declare module Immutable {
 >index : Symbol(index, Decl(immutable.ts, 27, 8))
 >value : Symbol(value, Decl(immutable.ts, 27, 22))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     delete(index: number): List<T>;
 >delete : Symbol(List.delete, Decl(immutable.ts, 27, 42))
 >index : Symbol(index, Decl(immutable.ts, 28, 11))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     remove(index: number): List<T>;
 >remove : Symbol(List.remove, Decl(immutable.ts, 28, 35))
 >index : Symbol(index, Decl(immutable.ts, 29, 11))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     insert(index: number, value: T): List<T>;
@@ -311,12 +311,12 @@ declare module Immutable {
 >index : Symbol(index, Decl(immutable.ts, 30, 11))
 >value : Symbol(value, Decl(immutable.ts, 30, 25))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     clear(): List<T>;
 >clear : Symbol(List.clear, Decl(immutable.ts, 30, 45))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     push(...values: Array<T>): List<T>;
@@ -324,12 +324,12 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 32, 9))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     pop(): List<T>;
 >pop : Symbol(List.pop, Decl(immutable.ts, 32, 39))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     unshift(...values: Array<T>): List<T>;
@@ -337,12 +337,12 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 34, 12))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     shift(): List<T>;
 >shift : Symbol(List.shift, Decl(immutable.ts, 34, 42))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     update(index: number, notSetValue: T, updater: (value: T) => T): this;
@@ -375,8 +375,8 @@ declare module Immutable {
 >merge : Symbol(List.merge, Decl(immutable.ts, 38, 46))
 >collections : Symbol(collections, Decl(immutable.ts, 39, 10))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
@@ -392,8 +392,8 @@ declare module Immutable {
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >collections : Symbol(collections, Decl(immutable.ts, 40, 63))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
@@ -402,8 +402,8 @@ declare module Immutable {
 >mergeDeep : Symbol(List.mergeDeep, Decl(immutable.ts, 40, 127))
 >collections : Symbol(collections, Decl(immutable.ts, 41, 14))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
@@ -419,8 +419,8 @@ declare module Immutable {
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >collections : Symbol(collections, Decl(immutable.ts, 42, 67))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
@@ -428,7 +428,7 @@ declare module Immutable {
     setSize(size: number): List<T>;
 >setSize : Symbol(List.setSize, Decl(immutable.ts, 42, 131))
 >size : Symbol(size, Decl(immutable.ts, 43, 12))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 
     // Deep persistent changes
@@ -498,7 +498,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 57, 11))
 >C : Symbol(C, Decl(immutable.ts, 57, 11))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >T : Symbol(T, Decl(immutable.ts, 25, 24))
 >C : Symbol(C, Decl(immutable.ts, 57, 11))
 
@@ -512,7 +512,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 58, 42))
 >M : Symbol(M, Decl(immutable.ts, 58, 8))
 >context : Symbol(context, Decl(immutable.ts, 58, 60))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >M : Symbol(M, Decl(immutable.ts, 58, 8))
 
     flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): List<M>;
@@ -526,7 +526,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 59, 12))
 >context : Symbol(context, Decl(immutable.ts, 59, 74))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >M : Symbol(M, Decl(immutable.ts, 59, 12))
 
     filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): List<F>;
@@ -541,7 +541,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 60, 36))
 >F : Symbol(F, Decl(immutable.ts, 60, 11))
 >context : Symbol(context, Decl(immutable.ts, 60, 87))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >F : Symbol(F, Decl(immutable.ts, 60, 11))
 
     filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
@@ -554,71 +554,71 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 61, 67))
   }
   export module Map {
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 
     function isMap(maybeMap: any): maybeMap is Map<any, any>;
 >isMap : Symbol(isMap, Decl(immutable.ts, 63, 21))
 >maybeMap : Symbol(maybeMap, Decl(immutable.ts, 64, 19))
 >maybeMap : Symbol(maybeMap, Decl(immutable.ts, 64, 19))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 
     function of(...keyValues: Array<any>): Map<any, any>;
 >of : Symbol(of, Decl(immutable.ts, 64, 61))
 >keyValues : Symbol(keyValues, Decl(immutable.ts, 65, 16))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
   }
   export function Map<K, V>(collection: Iterable<[K, V]>): Map<K, V>;
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 67, 22))
 >V : Symbol(V, Decl(immutable.ts, 67, 24))
 >collection : Symbol(collection, Decl(immutable.ts, 67, 28))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >K : Symbol(K, Decl(immutable.ts, 67, 22))
 >V : Symbol(V, Decl(immutable.ts, 67, 24))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 67, 22))
 >V : Symbol(V, Decl(immutable.ts, 67, 24))
 
   export function Map<T>(collection: Iterable<Iterable<T>>): Map<T, T>;
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >T : Symbol(T, Decl(immutable.ts, 68, 22))
 >collection : Symbol(collection, Decl(immutable.ts, 68, 25))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 68, 22))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >T : Symbol(T, Decl(immutable.ts, 68, 22))
 >T : Symbol(T, Decl(immutable.ts, 68, 22))
 
   export function Map<V>(obj: {[key: string]: V}): Map<string, V>;
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >V : Symbol(V, Decl(immutable.ts, 69, 22))
 >obj : Symbol(obj, Decl(immutable.ts, 69, 25))
 >key : Symbol(key, Decl(immutable.ts, 69, 32))
 >V : Symbol(V, Decl(immutable.ts, 69, 22))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >V : Symbol(V, Decl(immutable.ts, 69, 22))
 
   export function Map<K, V>(): Map<K, V>;
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 70, 22))
 >V : Symbol(V, Decl(immutable.ts, 70, 24))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 70, 22))
 >V : Symbol(V, Decl(immutable.ts, 70, 24))
 
   export function Map(): Map<any, any>;
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 
   export interface Map<K, V> extends Collection.Keyed<K, V> {
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
->Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 
@@ -687,7 +687,7 @@ declare module Immutable {
 >merge : Symbol(Map.merge, Decl(immutable.ts, 82, 46))
 >collections : Symbol(collections, Decl(immutable.ts, 83, 10))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >key : Symbol(key, Decl(immutable.ts, 83, 53))
@@ -705,7 +705,7 @@ declare module Immutable {
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >collections : Symbol(collections, Decl(immutable.ts, 84, 58))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >key : Symbol(key, Decl(immutable.ts, 84, 102))
@@ -715,7 +715,7 @@ declare module Immutable {
 >mergeDeep : Symbol(Map.mergeDeep, Decl(immutable.ts, 84, 127))
 >collections : Symbol(collections, Decl(immutable.ts, 85, 14))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >key : Symbol(key, Decl(immutable.ts, 85, 57))
@@ -733,7 +733,7 @@ declare module Immutable {
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >collections : Symbol(collections, Decl(immutable.ts, 86, 62))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >key : Symbol(key, Decl(immutable.ts, 86, 106))
@@ -807,7 +807,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >KC : Symbol(KC, Decl(immutable.ts, 100, 11))
 >VC : Symbol(VC, Decl(immutable.ts, 100, 14))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >KC : Symbol(KC, Decl(immutable.ts, 100, 11))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
@@ -820,7 +820,7 @@ declare module Immutable {
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >key : Symbol(key, Decl(immutable.ts, 101, 38))
 >C : Symbol(C, Decl(immutable.ts, 101, 11))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 >C : Symbol(C, Decl(immutable.ts, 101, 11))
@@ -836,7 +836,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 102, 37))
 >M : Symbol(M, Decl(immutable.ts, 102, 8))
 >context : Symbol(context, Decl(immutable.ts, 102, 55))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >M : Symbol(M, Decl(immutable.ts, 102, 8))
 
@@ -851,7 +851,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 103, 41))
 >M : Symbol(M, Decl(immutable.ts, 103, 12))
 >context : Symbol(context, Decl(immutable.ts, 103, 59))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >M : Symbol(M, Decl(immutable.ts, 103, 12))
 >V : Symbol(V, Decl(immutable.ts, 72, 25))
 
@@ -868,7 +868,7 @@ declare module Immutable {
 >KM : Symbol(KM, Decl(immutable.ts, 104, 15))
 >VM : Symbol(VM, Decl(immutable.ts, 104, 18))
 >context : Symbol(context, Decl(immutable.ts, 104, 86))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >KM : Symbol(KM, Decl(immutable.ts, 104, 15))
 >VM : Symbol(VM, Decl(immutable.ts, 104, 18))
 
@@ -884,7 +884,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 105, 12))
 >context : Symbol(context, Decl(immutable.ts, 105, 69))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Map<K, F>;
 >filter : Symbol(Map.filter, Decl(immutable.ts, 105, 100), Decl(immutable.ts, 106, 107))
@@ -899,7 +899,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 106, 36))
 >F : Symbol(F, Decl(immutable.ts, 106, 11))
 >context : Symbol(context, Decl(immutable.ts, 106, 80))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 72, 23))
 >F : Symbol(F, Decl(immutable.ts, 106, 11))
 
@@ -914,63 +914,63 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 107, 60))
   }
   export module OrderedMap {
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 
     function isOrderedMap(maybeOrderedMap: any): maybeOrderedMap is OrderedMap<any, any>;
 >isOrderedMap : Symbol(isOrderedMap, Decl(immutable.ts, 109, 28))
 >maybeOrderedMap : Symbol(maybeOrderedMap, Decl(immutable.ts, 110, 26))
 >maybeOrderedMap : Symbol(maybeOrderedMap, Decl(immutable.ts, 110, 26))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
   }
   export function OrderedMap<K, V>(collection: Iterable<[K, V]>): OrderedMap<K, V>;
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 112, 29))
 >V : Symbol(V, Decl(immutable.ts, 112, 31))
 >collection : Symbol(collection, Decl(immutable.ts, 112, 35))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >K : Symbol(K, Decl(immutable.ts, 112, 29))
 >V : Symbol(V, Decl(immutable.ts, 112, 31))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 112, 29))
 >V : Symbol(V, Decl(immutable.ts, 112, 31))
 
   export function OrderedMap<T>(collection: Iterable<Iterable<T>>): OrderedMap<T, T>;
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >T : Symbol(T, Decl(immutable.ts, 113, 29))
 >collection : Symbol(collection, Decl(immutable.ts, 113, 32))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 113, 29))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >T : Symbol(T, Decl(immutable.ts, 113, 29))
 >T : Symbol(T, Decl(immutable.ts, 113, 29))
 
   export function OrderedMap<V>(obj: {[key: string]: V}): OrderedMap<string, V>;
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >V : Symbol(V, Decl(immutable.ts, 114, 29))
 >obj : Symbol(obj, Decl(immutable.ts, 114, 32))
 >key : Symbol(key, Decl(immutable.ts, 114, 39))
 >V : Symbol(V, Decl(immutable.ts, 114, 29))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >V : Symbol(V, Decl(immutable.ts, 114, 29))
 
   export function OrderedMap<K, V>(): OrderedMap<K, V>;
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 115, 29))
 >V : Symbol(V, Decl(immutable.ts, 115, 31))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 115, 29))
 >V : Symbol(V, Decl(immutable.ts, 115, 31))
 
   export function OrderedMap(): OrderedMap<any, any>;
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 
   export interface OrderedMap<K, V> extends Map<K, V> {
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >V : Symbol(V, Decl(immutable.ts, 117, 32))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >V : Symbol(V, Decl(immutable.ts, 117, 32))
 
@@ -984,7 +984,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >KC : Symbol(KC, Decl(immutable.ts, 119, 11))
 >VC : Symbol(VC, Decl(immutable.ts, 119, 14))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >KC : Symbol(KC, Decl(immutable.ts, 119, 11))
 >V : Symbol(V, Decl(immutable.ts, 117, 32))
@@ -997,7 +997,7 @@ declare module Immutable {
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >key : Symbol(key, Decl(immutable.ts, 120, 38))
 >C : Symbol(C, Decl(immutable.ts, 120, 11))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >V : Symbol(V, Decl(immutable.ts, 117, 32))
 >C : Symbol(C, Decl(immutable.ts, 120, 11))
@@ -1013,7 +1013,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 121, 37))
 >M : Symbol(M, Decl(immutable.ts, 121, 8))
 >context : Symbol(context, Decl(immutable.ts, 121, 55))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >M : Symbol(M, Decl(immutable.ts, 121, 8))
 
@@ -1028,7 +1028,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 122, 41))
 >M : Symbol(M, Decl(immutable.ts, 122, 12))
 >context : Symbol(context, Decl(immutable.ts, 122, 59))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >M : Symbol(M, Decl(immutable.ts, 122, 12))
 >V : Symbol(V, Decl(immutable.ts, 117, 32))
 
@@ -1045,7 +1045,7 @@ declare module Immutable {
 >KM : Symbol(KM, Decl(immutable.ts, 123, 15))
 >VM : Symbol(VM, Decl(immutable.ts, 123, 18))
 >context : Symbol(context, Decl(immutable.ts, 123, 86))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >KM : Symbol(KM, Decl(immutable.ts, 123, 15))
 >VM : Symbol(VM, Decl(immutable.ts, 123, 18))
 
@@ -1061,7 +1061,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 124, 12))
 >context : Symbol(context, Decl(immutable.ts, 124, 69))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 
     filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): OrderedMap<K, F>;
 >filter : Symbol(OrderedMap.filter, Decl(immutable.ts, 124, 107), Decl(immutable.ts, 125, 114))
@@ -1076,7 +1076,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 125, 36))
 >F : Symbol(F, Decl(immutable.ts, 125, 11))
 >context : Symbol(context, Decl(immutable.ts, 125, 80))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 117, 30))
 >F : Symbol(F, Decl(immutable.ts, 125, 11))
 
@@ -1091,13 +1091,13 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 126, 60))
   }
   export module Set {
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 
     function isSet(maybeSet: any): maybeSet is Set<any>;
 >isSet : Symbol(isSet, Decl(immutable.ts, 128, 21))
 >maybeSet : Symbol(maybeSet, Decl(immutable.ts, 129, 19))
 >maybeSet : Symbol(maybeSet, Decl(immutable.ts, 129, 19))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 
     function of<T>(...values: Array<T>): Set<T>;
 >of : Symbol(of, Decl(immutable.ts, 129, 56))
@@ -1105,23 +1105,23 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 130, 19))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 130, 16))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 130, 16))
 
     function fromKeys<T>(iter: Collection<T, any>): Set<T>;
 >fromKeys : Symbol(fromKeys, Decl(immutable.ts, 130, 48), Decl(immutable.ts, 131, 59))
 >T : Symbol(T, Decl(immutable.ts, 131, 22))
 >iter : Symbol(iter, Decl(immutable.ts, 131, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 131, 22))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 131, 22))
 
     function fromKeys(obj: {[key: string]: any}): Set<string>;
 >fromKeys : Symbol(fromKeys, Decl(immutable.ts, 130, 48), Decl(immutable.ts, 131, 59))
 >obj : Symbol(obj, Decl(immutable.ts, 132, 22))
 >key : Symbol(key, Decl(immutable.ts, 132, 29))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 
     function intersect<T>(sets: Iterable<Iterable<T>>): Set<T>;
 >intersect : Symbol(intersect, Decl(immutable.ts, 132, 62))
@@ -1130,7 +1130,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 133, 23))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 133, 23))
 
     function union<T>(sets: Iterable<Iterable<T>>): Set<T>;
@@ -1140,34 +1140,34 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 134, 19))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 134, 19))
   }
   export function Set(): Set<any>;
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 
   export function Set<T>(): Set<T>;
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 137, 22))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 137, 22))
 
   export function Set<T>(collection: Iterable<T>): Set<T>;
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 138, 22))
 >collection : Symbol(collection, Decl(immutable.ts, 138, 25))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 138, 22))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 138, 22))
 
   export interface Set<T> extends Collection.Set<T> {
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
->Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Collection.Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 
     // Persistent changes
@@ -1193,7 +1193,7 @@ declare module Immutable {
 >union : Symbol(Set.union, Decl(immutable.ts, 144, 18))
 >collections : Symbol(collections, Decl(immutable.ts, 145, 10))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
@@ -1202,7 +1202,7 @@ declare module Immutable {
 >merge : Symbol(Set.merge, Decl(immutable.ts, 145, 70))
 >collections : Symbol(collections, Decl(immutable.ts, 146, 10))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
@@ -1211,7 +1211,7 @@ declare module Immutable {
 >intersect : Symbol(Set.intersect, Decl(immutable.ts, 146, 70))
 >collections : Symbol(collections, Decl(immutable.ts, 147, 14))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
@@ -1220,7 +1220,7 @@ declare module Immutable {
 >subtract : Symbol(Set.subtract, Decl(immutable.ts, 147, 74))
 >collections : Symbol(collections, Decl(immutable.ts, 148, 13))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
@@ -1246,7 +1246,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 154, 11))
 >C : Symbol(C, Decl(immutable.ts, 154, 11))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 139, 23))
 >C : Symbol(C, Decl(immutable.ts, 154, 11))
 
@@ -1260,7 +1260,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 155, 41))
 >M : Symbol(M, Decl(immutable.ts, 155, 8))
 >context : Symbol(context, Decl(immutable.ts, 155, 59))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >M : Symbol(M, Decl(immutable.ts, 155, 8))
 
     flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): Set<M>;
@@ -1274,7 +1274,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 156, 12))
 >context : Symbol(context, Decl(immutable.ts, 156, 73))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >M : Symbol(M, Decl(immutable.ts, 156, 12))
 
     filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Set<F>;
@@ -1289,7 +1289,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 157, 36))
 >F : Symbol(F, Decl(immutable.ts, 157, 11))
 >context : Symbol(context, Decl(immutable.ts, 157, 84))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >F : Symbol(F, Decl(immutable.ts, 157, 11))
 
     filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
@@ -1302,7 +1302,7 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 158, 64))
   }
   export module OrderedSet {
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 
     function isOrderedSet(maybeOrderedSet: any): boolean;
 >isOrderedSet : Symbol(isOrderedSet, Decl(immutable.ts, 160, 28))
@@ -1314,47 +1314,47 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 162, 19))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 162, 16))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 162, 16))
 
     function fromKeys<T>(iter: Collection<T, any>): OrderedSet<T>;
 >fromKeys : Symbol(fromKeys, Decl(immutable.ts, 162, 55), Decl(immutable.ts, 163, 66))
 >T : Symbol(T, Decl(immutable.ts, 163, 22))
 >iter : Symbol(iter, Decl(immutable.ts, 163, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 163, 22))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 163, 22))
 
     function fromKeys(obj: {[key: string]: any}): OrderedSet<string>;
 >fromKeys : Symbol(fromKeys, Decl(immutable.ts, 162, 55), Decl(immutable.ts, 163, 66))
 >obj : Symbol(obj, Decl(immutable.ts, 164, 22))
 >key : Symbol(key, Decl(immutable.ts, 164, 29))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
   }
   export function OrderedSet(): OrderedSet<any>;
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 
   export function OrderedSet<T>(): OrderedSet<T>;
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 167, 29))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 167, 29))
 
   export function OrderedSet<T>(collection: Iterable<T>): OrderedSet<T>;
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 168, 29))
 >collection : Symbol(collection, Decl(immutable.ts, 168, 32))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 168, 29))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 168, 29))
 
   export interface OrderedSet<T> extends Set<T> {
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 169, 30))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >T : Symbol(T, Decl(immutable.ts, 169, 30))
 
     // Sequence algorithms
@@ -1366,7 +1366,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 171, 11))
 >C : Symbol(C, Decl(immutable.ts, 171, 11))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >T : Symbol(T, Decl(immutable.ts, 169, 30))
 >C : Symbol(C, Decl(immutable.ts, 171, 11))
 
@@ -1380,7 +1380,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 172, 41))
 >M : Symbol(M, Decl(immutable.ts, 172, 8))
 >context : Symbol(context, Decl(immutable.ts, 172, 59))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >M : Symbol(M, Decl(immutable.ts, 172, 8))
 
     flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): OrderedSet<M>;
@@ -1394,7 +1394,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 173, 12))
 >context : Symbol(context, Decl(immutable.ts, 173, 73))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >M : Symbol(M, Decl(immutable.ts, 173, 12))
 
     filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): OrderedSet<F>;
@@ -1409,7 +1409,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 174, 36))
 >F : Symbol(F, Decl(immutable.ts, 174, 11))
 >context : Symbol(context, Decl(immutable.ts, 174, 84))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >F : Symbol(F, Decl(immutable.ts, 174, 11))
 
     filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
@@ -1425,8 +1425,8 @@ declare module Immutable {
 >zip : Symbol(OrderedSet.zip, Decl(immutable.ts, 175, 86))
 >collections : Symbol(collections, Decl(immutable.ts, 176, 8))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 
     zipWith<U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): OrderedSet<Z>;
 >zipWith : Symbol(OrderedSet.zipWith, Decl(immutable.ts, 176, 70), Decl(immutable.ts, 177, 110), Decl(immutable.ts, 178, 165))
@@ -1439,9 +1439,9 @@ declare module Immutable {
 >U : Symbol(U, Decl(immutable.ts, 177, 12))
 >Z : Symbol(Z, Decl(immutable.ts, 177, 14))
 >otherCollection : Symbol(otherCollection, Decl(immutable.ts, 177, 57))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >U : Symbol(U, Decl(immutable.ts, 177, 12))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >Z : Symbol(Z, Decl(immutable.ts, 177, 14))
 
     zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): OrderedSet<Z>;
@@ -1458,12 +1458,12 @@ declare module Immutable {
 >V : Symbol(V, Decl(immutable.ts, 178, 14))
 >Z : Symbol(Z, Decl(immutable.ts, 178, 17))
 >otherCollection : Symbol(otherCollection, Decl(immutable.ts, 178, 75))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >U : Symbol(U, Decl(immutable.ts, 178, 12))
 >thirdCollection : Symbol(thirdCollection, Decl(immutable.ts, 178, 112))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >V : Symbol(V, Decl(immutable.ts, 178, 14))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >Z : Symbol(Z, Decl(immutable.ts, 178, 17))
 
     zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): OrderedSet<Z>;
@@ -1475,18 +1475,18 @@ declare module Immutable {
 >Z : Symbol(Z, Decl(immutable.ts, 179, 12))
 >collections : Symbol(collections, Decl(immutable.ts, 179, 49))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >Z : Symbol(Z, Decl(immutable.ts, 179, 12))
   }
   export module Stack {
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 
     function isStack(maybeStack: any): maybeStack is Stack<any>;
 >isStack : Symbol(isStack, Decl(immutable.ts, 181, 23))
 >maybeStack : Symbol(maybeStack, Decl(immutable.ts, 182, 21))
 >maybeStack : Symbol(maybeStack, Decl(immutable.ts, 182, 21))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 
     function of<T>(...values: Array<T>): Stack<T>;
 >of : Symbol(of, Decl(immutable.ts, 182, 64))
@@ -1494,34 +1494,34 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 183, 19))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 183, 16))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 183, 16))
   }
   export function Stack(): Stack<any>;
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 
   export function Stack<T>(): Stack<T>;
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 186, 24))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 186, 24))
 
   export function Stack<T>(collection: Iterable<T>): Stack<T>;
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 187, 24))
 >collection : Symbol(collection, Decl(immutable.ts, 187, 27))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 187, 24))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 187, 24))
 
   export interface Stack<T> extends Collection.Indexed<T> {
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     // Reading values
@@ -1532,7 +1532,7 @@ declare module Immutable {
     // Persistent changes
     clear(): Stack<T>;
 >clear : Symbol(Stack.clear, Decl(immutable.ts, 190, 26))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     unshift(...values: Array<T>): Stack<T>;
@@ -1540,7 +1540,7 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 193, 12))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     unshiftAll(iter: Iterable<T>): Stack<T>;
@@ -1548,12 +1548,12 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 194, 15))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     shift(): Stack<T>;
 >shift : Symbol(Stack.shift, Decl(immutable.ts, 194, 44))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     push(...values: Array<T>): Stack<T>;
@@ -1561,7 +1561,7 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 196, 9))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     pushAll(iter: Iterable<T>): Stack<T>;
@@ -1569,12 +1569,12 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 197, 12))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     pop(): Stack<T>;
 >pop : Symbol(Stack.pop, Decl(immutable.ts, 197, 41))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 
     // Transient changes
@@ -1598,7 +1598,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 204, 11))
 >C : Symbol(C, Decl(immutable.ts, 204, 11))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >T : Symbol(T, Decl(immutable.ts, 188, 25))
 >C : Symbol(C, Decl(immutable.ts, 204, 11))
 
@@ -1612,7 +1612,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 205, 42))
 >M : Symbol(M, Decl(immutable.ts, 205, 8))
 >context : Symbol(context, Decl(immutable.ts, 205, 60))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >M : Symbol(M, Decl(immutable.ts, 205, 8))
 
     flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Stack<M>;
@@ -1626,7 +1626,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 206, 12))
 >context : Symbol(context, Decl(immutable.ts, 206, 74))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >M : Symbol(M, Decl(immutable.ts, 206, 12))
 
     filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Set<F>;
@@ -1641,7 +1641,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 207, 36))
 >F : Symbol(F, Decl(immutable.ts, 207, 11))
 >context : Symbol(context, Decl(immutable.ts, 207, 87))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >F : Symbol(F, Decl(immutable.ts, 207, 11))
 
     filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
@@ -1658,8 +1658,8 @@ declare module Immutable {
 >start : Symbol(start, Decl(immutable.ts, 210, 24))
 >end : Symbol(end, Decl(immutable.ts, 210, 39))
 >step : Symbol(step, Decl(immutable.ts, 210, 53))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 
   export function Repeat<T>(value: T, times?: number): Seq.Indexed<T>;
 >Repeat : Symbol(Repeat, Decl(immutable.ts, 210, 90))
@@ -1667,18 +1667,18 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 211, 28))
 >T : Symbol(T, Decl(immutable.ts, 211, 25))
 >times : Symbol(times, Decl(immutable.ts, 211, 37))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 211, 25))
 
   export module Record {
->Record : Symbol(Record, Decl(immutable.ts, 211, 70), Decl(immutable.ts, 259, 3))
+>Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70))
 
     export function isRecord(maybeRecord: any): maybeRecord is Record.Instance<any>;
 >isRecord : Symbol(isRecord, Decl(immutable.ts, 212, 24))
 >maybeRecord : Symbol(maybeRecord, Decl(immutable.ts, 213, 29))
 >maybeRecord : Symbol(maybeRecord, Decl(immutable.ts, 213, 29))
->Record : Symbol(Record, Decl(immutable.ts, 211, 70), Decl(immutable.ts, 259, 3))
+>Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70))
 >Instance : Symbol(Instance, Decl(immutable.ts, 218, 5))
 
     export function getDescriptiveName(record: Instance<any>): string;
@@ -1901,8 +1901,8 @@ declare module Immutable {
       // Sequence algorithms
       toSeq(): Seq.Keyed<keyof T, T[keyof T]>;
 >toSeq : Symbol(Instance.toSeq, Decl(immutable.ts, 254, 26))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >T : Symbol(T, Decl(immutable.ts, 219, 30))
 >T : Symbol(T, Decl(immutable.ts, 219, 30))
 >T : Symbol(T, Decl(immutable.ts, 219, 30))
@@ -1919,26 +1919,26 @@ declare module Immutable {
     }
   }
   export function Record<T>(defaultValues: T, name?: string): Record.Class<T>;
->Record : Symbol(Record, Decl(immutable.ts, 211, 70), Decl(immutable.ts, 259, 3))
+>Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70))
 >T : Symbol(T, Decl(immutable.ts, 260, 25))
 >defaultValues : Symbol(defaultValues, Decl(immutable.ts, 260, 28))
 >T : Symbol(T, Decl(immutable.ts, 260, 25))
 >name : Symbol(name, Decl(immutable.ts, 260, 45))
->Record : Symbol(Record, Decl(immutable.ts, 211, 70), Decl(immutable.ts, 259, 3))
+>Record : Symbol(Record, Decl(immutable.ts, 259, 3), Decl(immutable.ts, 211, 70))
 >Class : Symbol(Record.Class, Decl(immutable.ts, 214, 70))
 >T : Symbol(T, Decl(immutable.ts, 260, 25))
 
   export module Seq {
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 
     function isSeq(maybeSeq: any): maybeSeq is Seq.Indexed<any> | Seq.Keyed<any, any>;
 >isSeq : Symbol(isSeq, Decl(immutable.ts, 261, 21))
 >maybeSeq : Symbol(maybeSeq, Decl(immutable.ts, 262, 19))
 >maybeSeq : Symbol(maybeSeq, Decl(immutable.ts, 262, 19))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 
     function of<T>(...values: Array<T>): Seq.Indexed<T>;
 >of : Symbol(of, Decl(immutable.ts, 262, 86))
@@ -1946,60 +1946,60 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 263, 19))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 263, 16))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 263, 16))
 
     export module Keyed {}
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Seq.Keyed<K, V>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 265, 26))
 >V : Symbol(V, Decl(immutable.ts, 265, 28))
 >collection : Symbol(collection, Decl(immutable.ts, 265, 32))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >K : Symbol(K, Decl(immutable.ts, 265, 26))
 >V : Symbol(V, Decl(immutable.ts, 265, 28))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 265, 26))
 >V : Symbol(V, Decl(immutable.ts, 265, 28))
 
     export function Keyed<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >V : Symbol(V, Decl(immutable.ts, 266, 26))
 >obj : Symbol(obj, Decl(immutable.ts, 266, 29))
 >key : Symbol(key, Decl(immutable.ts, 266, 36))
 >V : Symbol(V, Decl(immutable.ts, 266, 26))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >V : Symbol(V, Decl(immutable.ts, 266, 26))
 
     export function Keyed<K, V>(): Seq.Keyed<K, V>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 267, 26))
 >V : Symbol(V, Decl(immutable.ts, 267, 28))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 267, 26))
 >V : Symbol(V, Decl(immutable.ts, 267, 28))
 
     export function Keyed(): Seq.Keyed<any, any>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 
     export interface Keyed<K, V> extends Seq<K, V>, Collection.Keyed<K, V> {
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
->Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection.Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
 
@@ -2024,8 +2024,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >KC : Symbol(KC, Decl(immutable.ts, 273, 13))
 >VC : Symbol(VC, Decl(immutable.ts, 273, 16))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >KC : Symbol(KC, Decl(immutable.ts, 273, 13))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
@@ -2038,8 +2038,8 @@ declare module Immutable {
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >key : Symbol(key, Decl(immutable.ts, 274, 40))
 >C : Symbol(C, Decl(immutable.ts, 274, 13))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
 >C : Symbol(C, Decl(immutable.ts, 274, 13))
@@ -2055,8 +2055,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 275, 39))
 >M : Symbol(M, Decl(immutable.ts, 275, 10))
 >context : Symbol(context, Decl(immutable.ts, 275, 57))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >M : Symbol(M, Decl(immutable.ts, 275, 10))
 
@@ -2071,8 +2071,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 276, 43))
 >M : Symbol(M, Decl(immutable.ts, 276, 14))
 >context : Symbol(context, Decl(immutable.ts, 276, 61))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >M : Symbol(M, Decl(immutable.ts, 276, 14))
 >V : Symbol(V, Decl(immutable.ts, 269, 29))
 
@@ -2089,8 +2089,8 @@ declare module Immutable {
 >KM : Symbol(KM, Decl(immutable.ts, 277, 17))
 >VM : Symbol(VM, Decl(immutable.ts, 277, 20))
 >context : Symbol(context, Decl(immutable.ts, 277, 88))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >KM : Symbol(KM, Decl(immutable.ts, 277, 17))
 >VM : Symbol(VM, Decl(immutable.ts, 277, 20))
 
@@ -2106,8 +2106,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 278, 14))
 >context : Symbol(context, Decl(immutable.ts, 278, 71))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 
       filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Seq.Keyed<K, F>;
 >filter : Symbol(Keyed.filter, Decl(immutable.ts, 278, 108), Decl(immutable.ts, 279, 115))
@@ -2122,8 +2122,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 279, 38))
 >F : Symbol(F, Decl(immutable.ts, 279, 13))
 >context : Symbol(context, Decl(immutable.ts, 279, 82))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 269, 27))
 >F : Symbol(F, Decl(immutable.ts, 279, 13))
 
@@ -2138,7 +2138,7 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 280, 62))
     }
     module Indexed {
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 
       function of<T>(...values: Array<T>): Seq.Indexed<T>;
 >of : Symbol(of, Decl(immutable.ts, 282, 20))
@@ -2146,40 +2146,40 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 283, 21))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 283, 18))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 283, 18))
     }
     export function Indexed(): Seq.Indexed<any>;
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 
     export function Indexed<T>(): Seq.Indexed<T>;
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 286, 28))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 286, 28))
 
     export function Indexed<T>(collection: Iterable<T>): Seq.Indexed<T>;
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 287, 28))
 >collection : Symbol(collection, Decl(immutable.ts, 287, 31))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 287, 28))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 287, 28))
 
     export interface Indexed<T> extends Seq<number, T>, Collection.Indexed<T> {
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 288, 29))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >T : Symbol(T, Decl(immutable.ts, 288, 29))
->Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection.Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 288, 29))
 
       toJS(): Array<any>;
@@ -2202,8 +2202,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 292, 13))
 >C : Symbol(C, Decl(immutable.ts, 292, 13))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 288, 29))
 >C : Symbol(C, Decl(immutable.ts, 292, 13))
 
@@ -2217,8 +2217,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 293, 44))
 >M : Symbol(M, Decl(immutable.ts, 293, 10))
 >context : Symbol(context, Decl(immutable.ts, 293, 62))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >M : Symbol(M, Decl(immutable.ts, 293, 10))
 
       flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Seq.Indexed<M>;
@@ -2232,8 +2232,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 294, 14))
 >context : Symbol(context, Decl(immutable.ts, 294, 76))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >M : Symbol(M, Decl(immutable.ts, 294, 14))
 
       filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Seq.Indexed<F>;
@@ -2248,8 +2248,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 295, 38))
 >F : Symbol(F, Decl(immutable.ts, 295, 13))
 >context : Symbol(context, Decl(immutable.ts, 295, 89))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >F : Symbol(F, Decl(immutable.ts, 295, 13))
 
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
@@ -2262,7 +2262,7 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 296, 69))
     }
     export module Set {
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 
       function of<T>(...values: Array<T>): Seq.Set<T>;
 >of : Symbol(of, Decl(immutable.ts, 298, 23))
@@ -2270,40 +2270,40 @@ declare module Immutable {
 >values : Symbol(values, Decl(immutable.ts, 299, 21))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 299, 18))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 299, 18))
     }
     export function Set(): Seq.Set<any>;
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 
     export function Set<T>(): Seq.Set<T>;
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 302, 24))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 302, 24))
 
     export function Set<T>(collection: Iterable<T>): Seq.Set<T>;
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 303, 24))
 >collection : Symbol(collection, Decl(immutable.ts, 303, 27))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 303, 24))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 303, 24))
 
     export interface Set<T> extends Seq<never, T>, Collection.Set<T> {
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 304, 25))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >T : Symbol(T, Decl(immutable.ts, 304, 25))
->Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Collection.Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection.Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 304, 25))
 
       toJS(): Array<any>;
@@ -2326,8 +2326,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 308, 13))
 >C : Symbol(C, Decl(immutable.ts, 308, 13))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 304, 25))
 >C : Symbol(C, Decl(immutable.ts, 308, 13))
 
@@ -2341,8 +2341,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 309, 43))
 >M : Symbol(M, Decl(immutable.ts, 309, 10))
 >context : Symbol(context, Decl(immutable.ts, 309, 61))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >M : Symbol(M, Decl(immutable.ts, 309, 10))
 
       flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any): Seq.Set<M>;
@@ -2356,8 +2356,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 310, 14))
 >context : Symbol(context, Decl(immutable.ts, 310, 75))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >M : Symbol(M, Decl(immutable.ts, 310, 14))
 
       filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Seq.Set<F>;
@@ -2372,8 +2372,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 311, 38))
 >F : Symbol(F, Decl(immutable.ts, 311, 13))
 >context : Symbol(context, Decl(immutable.ts, 311, 86))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >F : Symbol(F, Decl(immutable.ts, 311, 13))
 
       filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
@@ -2387,78 +2387,78 @@ declare module Immutable {
     }
   }
   export function Seq<S extends Seq<any, any>>(seq: S): S;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >S : Symbol(S, Decl(immutable.ts, 315, 22))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >seq : Symbol(seq, Decl(immutable.ts, 315, 47))
 >S : Symbol(S, Decl(immutable.ts, 315, 22))
 >S : Symbol(S, Decl(immutable.ts, 315, 22))
 
   export function Seq<K, V>(collection: Collection.Keyed<K, V>): Seq.Keyed<K, V>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 316, 22))
 >V : Symbol(V, Decl(immutable.ts, 316, 24))
 >collection : Symbol(collection, Decl(immutable.ts, 316, 28))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 316, 22))
 >V : Symbol(V, Decl(immutable.ts, 316, 24))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 316, 22))
 >V : Symbol(V, Decl(immutable.ts, 316, 24))
 
   export function Seq<T>(collection: Collection.Indexed<T>): Seq.Indexed<T>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >T : Symbol(T, Decl(immutable.ts, 317, 22))
 >collection : Symbol(collection, Decl(immutable.ts, 317, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 317, 22))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 317, 22))
 
   export function Seq<T>(collection: Collection.Set<T>): Seq.Set<T>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >T : Symbol(T, Decl(immutable.ts, 318, 22))
 >collection : Symbol(collection, Decl(immutable.ts, 318, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Collection.Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Collection.Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 318, 22))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Seq.Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Seq.Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 318, 22))
 
   export function Seq<T>(collection: Iterable<T>): Seq.Indexed<T>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >T : Symbol(T, Decl(immutable.ts, 319, 22))
 >collection : Symbol(collection, Decl(immutable.ts, 319, 25))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 319, 22))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 319, 22))
 
   export function Seq<V>(obj: {[key: string]: V}): Seq.Keyed<string, V>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >V : Symbol(V, Decl(immutable.ts, 320, 22))
 >obj : Symbol(obj, Decl(immutable.ts, 320, 25))
 >key : Symbol(key, Decl(immutable.ts, 320, 32))
 >V : Symbol(V, Decl(immutable.ts, 320, 22))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >V : Symbol(V, Decl(immutable.ts, 320, 22))
 
   export function Seq(): Seq<any, any>;
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 
   export interface Seq<K, V> extends Collection<K, V> {
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 322, 23))
 >V : Symbol(V, Decl(immutable.ts, 322, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 322, 23))
 >V : Symbol(V, Decl(immutable.ts, 322, 25))
 
@@ -2481,7 +2481,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 327, 37))
 >M : Symbol(M, Decl(immutable.ts, 327, 8))
 >context : Symbol(context, Decl(immutable.ts, 327, 55))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 322, 23))
 >M : Symbol(M, Decl(immutable.ts, 327, 8))
 
@@ -2497,7 +2497,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 328, 12))
 >context : Symbol(context, Decl(immutable.ts, 328, 69))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 322, 23))
 >M : Symbol(M, Decl(immutable.ts, 328, 12))
 
@@ -2514,7 +2514,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 329, 36))
 >F : Symbol(F, Decl(immutable.ts, 329, 11))
 >context : Symbol(context, Decl(immutable.ts, 329, 80))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
 >K : Symbol(K, Decl(immutable.ts, 322, 23))
 >F : Symbol(F, Decl(immutable.ts, 329, 11))
 
@@ -2529,66 +2529,66 @@ declare module Immutable {
 >context : Symbol(context, Decl(immutable.ts, 330, 60))
   }
   export module Collection {
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
     function isKeyed(maybeKeyed: any): maybeKeyed is Collection.Keyed<any, any>;
 >isKeyed : Symbol(isKeyed, Decl(immutable.ts, 332, 28))
 >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 333, 21))
 >maybeKeyed : Symbol(maybeKeyed, Decl(immutable.ts, 333, 21))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 
     function isIndexed(maybeIndexed: any): maybeIndexed is Collection.Indexed<any>;
 >isIndexed : Symbol(isIndexed, Decl(immutable.ts, 333, 80))
 >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 334, 23))
 >maybeIndexed : Symbol(maybeIndexed, Decl(immutable.ts, 334, 23))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
     function isAssociative(maybeAssociative: any): maybeAssociative is Collection.Keyed<any, any> | Collection.Indexed<any>;
 >isAssociative : Symbol(isAssociative, Decl(immutable.ts, 334, 83))
 >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 335, 27))
 >maybeAssociative : Symbol(maybeAssociative, Decl(immutable.ts, 335, 27))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
     function isOrdered(maybeOrdered: any): boolean;
 >isOrdered : Symbol(isOrdered, Decl(immutable.ts, 335, 124))
 >maybeOrdered : Symbol(maybeOrdered, Decl(immutable.ts, 336, 23))
 
     export module Keyed {}
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 
     export function Keyed<K, V>(collection: Iterable<[K, V]>): Collection.Keyed<K, V>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 338, 26))
 >V : Symbol(V, Decl(immutable.ts, 338, 28))
 >collection : Symbol(collection, Decl(immutable.ts, 338, 32))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >K : Symbol(K, Decl(immutable.ts, 338, 26))
 >V : Symbol(V, Decl(immutable.ts, 338, 28))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 338, 26))
 >V : Symbol(V, Decl(immutable.ts, 338, 28))
 
     export function Keyed<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >V : Symbol(V, Decl(immutable.ts, 339, 26))
 >obj : Symbol(obj, Decl(immutable.ts, 339, 29))
 >key : Symbol(key, Decl(immutable.ts, 339, 36))
 >V : Symbol(V, Decl(immutable.ts, 339, 26))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >V : Symbol(V, Decl(immutable.ts, 339, 26))
 
     export interface Keyed<K, V> extends Collection<K, V> {
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
 
@@ -2603,8 +2603,8 @@ declare module Immutable {
 
       toSeq(): Seq.Keyed<K, V>;
 >toSeq : Symbol(Keyed.toSeq, Decl(immutable.ts, 342, 37))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
 
@@ -2621,8 +2621,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >KC : Symbol(KC, Decl(immutable.ts, 346, 13))
 >VC : Symbol(VC, Decl(immutable.ts, 346, 16))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >KC : Symbol(KC, Decl(immutable.ts, 346, 13))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
@@ -2635,8 +2635,8 @@ declare module Immutable {
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
 >key : Symbol(key, Decl(immutable.ts, 347, 40))
 >C : Symbol(C, Decl(immutable.ts, 347, 13))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
 >C : Symbol(C, Decl(immutable.ts, 347, 13))
@@ -2652,8 +2652,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 348, 39))
 >M : Symbol(M, Decl(immutable.ts, 348, 10))
 >context : Symbol(context, Decl(immutable.ts, 348, 57))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >M : Symbol(M, Decl(immutable.ts, 348, 10))
 
@@ -2668,8 +2668,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 349, 43))
 >M : Symbol(M, Decl(immutable.ts, 349, 14))
 >context : Symbol(context, Decl(immutable.ts, 349, 61))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >M : Symbol(M, Decl(immutable.ts, 349, 14))
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
 
@@ -2686,8 +2686,8 @@ declare module Immutable {
 >KM : Symbol(KM, Decl(immutable.ts, 350, 17))
 >VM : Symbol(VM, Decl(immutable.ts, 350, 20))
 >context : Symbol(context, Decl(immutable.ts, 350, 88))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >KM : Symbol(KM, Decl(immutable.ts, 350, 17))
 >VM : Symbol(VM, Decl(immutable.ts, 350, 20))
 
@@ -2703,8 +2703,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 351, 14))
 >context : Symbol(context, Decl(immutable.ts, 351, 71))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 
       filter<F extends V>(predicate: (value: V, key: K, iter: this) => value is F, context?: any): Collection.Keyed<K, F>;
 >filter : Symbol(Keyed.filter, Decl(immutable.ts, 351, 115), Decl(immutable.ts, 352, 122))
@@ -2719,8 +2719,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 352, 38))
 >F : Symbol(F, Decl(immutable.ts, 352, 13))
 >context : Symbol(context, Decl(immutable.ts, 352, 82))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >K : Symbol(K, Decl(immutable.ts, 340, 27))
 >F : Symbol(F, Decl(immutable.ts, 352, 13))
 
@@ -2744,22 +2744,22 @@ declare module Immutable {
 >V : Symbol(V, Decl(immutable.ts, 340, 29))
     }
     export module Indexed {}
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
     export function Indexed<T>(collection: Iterable<T>): Collection.Indexed<T>;
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 357, 28))
 >collection : Symbol(collection, Decl(immutable.ts, 357, 31))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 357, 28))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 357, 28))
 
     export interface Indexed<T> extends Collection<number, T> {
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
 
       toJS(): Array<any>;
@@ -2789,14 +2789,14 @@ declare module Immutable {
       // Conversion to Seq
       toSeq(): Seq.Indexed<T>;
 >toSeq : Symbol(Indexed.toSeq, Decl(immutable.ts, 363, 40))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
 
       fromEntrySeq(): Seq.Keyed<any, any>;
 >fromEntrySeq : Symbol(Indexed.fromEntrySeq, Decl(immutable.ts, 365, 30))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 
       // Combination
       interpose(separator: T): this;
@@ -2808,7 +2808,7 @@ declare module Immutable {
 >interleave : Symbol(Indexed.interleave, Decl(immutable.ts, 368, 36))
 >collections : Symbol(collections, Decl(immutable.ts, 369, 17))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
 
       splice(index: number, removeNum: number, ...values: Array<T>): this;
@@ -2823,9 +2823,9 @@ declare module Immutable {
 >zip : Symbol(Indexed.zip, Decl(immutable.ts, 370, 74))
 >collections : Symbol(collections, Decl(immutable.ts, 371, 10))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 
       zipWith<U, Z>(zipper: (value: T, otherValue: U) => Z, otherCollection: Collection<any, U>): Collection.Indexed<Z>;
 >zipWith : Symbol(Indexed.zipWith, Decl(immutable.ts, 371, 80), Decl(immutable.ts, 372, 120), Decl(immutable.ts, 373, 175))
@@ -2838,10 +2838,10 @@ declare module Immutable {
 >U : Symbol(U, Decl(immutable.ts, 372, 14))
 >Z : Symbol(Z, Decl(immutable.ts, 372, 16))
 >otherCollection : Symbol(otherCollection, Decl(immutable.ts, 372, 59))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >U : Symbol(U, Decl(immutable.ts, 372, 14))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >Z : Symbol(Z, Decl(immutable.ts, 372, 16))
 
       zipWith<U, V, Z>(zipper: (value: T, otherValue: U, thirdValue: V) => Z, otherCollection: Collection<any, U>, thirdCollection: Collection<any, V>): Collection.Indexed<Z>;
@@ -2858,13 +2858,13 @@ declare module Immutable {
 >V : Symbol(V, Decl(immutable.ts, 373, 16))
 >Z : Symbol(Z, Decl(immutable.ts, 373, 19))
 >otherCollection : Symbol(otherCollection, Decl(immutable.ts, 373, 77))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >U : Symbol(U, Decl(immutable.ts, 373, 14))
 >thirdCollection : Symbol(thirdCollection, Decl(immutable.ts, 373, 114))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >V : Symbol(V, Decl(immutable.ts, 373, 16))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >Z : Symbol(Z, Decl(immutable.ts, 373, 19))
 
       zipWith<Z>(zipper: (...any: Array<any>) => Z, ...collections: Array<Collection<any, any>>): Collection.Indexed<Z>;
@@ -2876,9 +2876,9 @@ declare module Immutable {
 >Z : Symbol(Z, Decl(immutable.ts, 374, 14))
 >collections : Symbol(collections, Decl(immutable.ts, 374, 51))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >Z : Symbol(Z, Decl(immutable.ts, 374, 14))
 
       // Search for value
@@ -2919,8 +2919,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 381, 13))
 >C : Symbol(C, Decl(immutable.ts, 381, 13))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
 >C : Symbol(C, Decl(immutable.ts, 381, 13))
 
@@ -2934,8 +2934,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 382, 44))
 >M : Symbol(M, Decl(immutable.ts, 382, 10))
 >context : Symbol(context, Decl(immutable.ts, 382, 62))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >M : Symbol(M, Decl(immutable.ts, 382, 10))
 
       flatMap<M>(mapper: (value: T, key: number, iter: this) => Iterable<M>, context?: any): Collection.Indexed<M>;
@@ -2949,8 +2949,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 383, 14))
 >context : Symbol(context, Decl(immutable.ts, 383, 76))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >M : Symbol(M, Decl(immutable.ts, 383, 14))
 
       filter<F extends T>(predicate: (value: T, index: number, iter: this) => value is F, context?: any): Collection.Indexed<F>;
@@ -2965,8 +2965,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 384, 38))
 >F : Symbol(F, Decl(immutable.ts, 384, 13))
 >context : Symbol(context, Decl(immutable.ts, 384, 89))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >F : Symbol(F, Decl(immutable.ts, 384, 13))
 
       filter(predicate: (value: T, index: number, iter: this) => any, context?: any): this;
@@ -2987,22 +2987,22 @@ declare module Immutable {
 >T : Symbol(T, Decl(immutable.ts, 358, 29))
     }
     export module Set {}
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 
     export function Set<T>(collection: Iterable<T>): Collection.Set<T>;
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 389, 24))
 >collection : Symbol(collection, Decl(immutable.ts, 389, 27))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 389, 24))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 389, 24))
 
     export interface Set<T> extends Collection<never, T> {
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 390, 25))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 390, 25))
 
       toJS(): Array<any>;
@@ -3016,8 +3016,8 @@ declare module Immutable {
 
       toSeq(): Seq.Set<T>;
 >toSeq : Symbol(Set.toSeq, Decl(immutable.ts, 392, 25))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Seq.Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Seq.Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >T : Symbol(T, Decl(immutable.ts, 390, 25))
 
       // Sequence algorithms
@@ -3029,8 +3029,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >C : Symbol(C, Decl(immutable.ts, 395, 13))
 >C : Symbol(C, Decl(immutable.ts, 395, 13))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >T : Symbol(T, Decl(immutable.ts, 390, 25))
 >C : Symbol(C, Decl(immutable.ts, 395, 13))
 
@@ -3044,8 +3044,8 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 396, 43))
 >M : Symbol(M, Decl(immutable.ts, 396, 10))
 >context : Symbol(context, Decl(immutable.ts, 396, 61))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >M : Symbol(M, Decl(immutable.ts, 396, 10))
 
       flatMap<M>(mapper: (value: T, key: never, iter: this) => Iterable<M>, context?: any):  Collection.Set<M>;
@@ -3059,8 +3059,8 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 397, 14))
 >context : Symbol(context, Decl(immutable.ts, 397, 75))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >M : Symbol(M, Decl(immutable.ts, 397, 14))
 
       filter<F extends T>(predicate: (value: T, key: never, iter: this) => value is F, context?: any): Collection.Set<F>;
@@ -3075,8 +3075,8 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 398, 38))
 >F : Symbol(F, Decl(immutable.ts, 398, 13))
 >context : Symbol(context, Decl(immutable.ts, 398, 86))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Set : Symbol(Set, Decl(immutable.ts, 387, 5), Decl(immutable.ts, 388, 24), Decl(immutable.ts, 389, 71))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Set : Symbol(Set, Decl(immutable.ts, 388, 24), Decl(immutable.ts, 387, 5), Decl(immutable.ts, 389, 71))
 >F : Symbol(F, Decl(immutable.ts, 398, 13))
 
       filter(predicate: (value: T, key: never, iter: this) => any, context?: any): this;
@@ -3098,35 +3098,35 @@ declare module Immutable {
     }
   }
   export function Collection<I extends Collection<any, any>>(collection: I): I;
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >I : Symbol(I, Decl(immutable.ts, 403, 29))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >collection : Symbol(collection, Decl(immutable.ts, 403, 61))
 >I : Symbol(I, Decl(immutable.ts, 403, 29))
 >I : Symbol(I, Decl(immutable.ts, 403, 29))
 
   export function Collection<T>(collection: Iterable<T>): Collection.Indexed<T>;
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >T : Symbol(T, Decl(immutable.ts, 404, 29))
 >collection : Symbol(collection, Decl(immutable.ts, 404, 32))
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >T : Symbol(T, Decl(immutable.ts, 404, 29))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 355, 5), Decl(immutable.ts, 356, 28), Decl(immutable.ts, 357, 79))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Indexed : Symbol(Collection.Indexed, Decl(immutable.ts, 356, 28), Decl(immutable.ts, 355, 5), Decl(immutable.ts, 357, 79))
 >T : Symbol(T, Decl(immutable.ts, 404, 29))
 
   export function Collection<V>(obj: {[key: string]: V}): Collection.Keyed<string, V>;
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >V : Symbol(V, Decl(immutable.ts, 405, 29))
 >obj : Symbol(obj, Decl(immutable.ts, 405, 32))
 >key : Symbol(key, Decl(immutable.ts, 405, 39))
 >V : Symbol(V, Decl(immutable.ts, 405, 29))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
->Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 336, 51), Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 339, 83))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
+>Keyed : Symbol(Collection.Keyed, Decl(immutable.ts, 337, 26), Decl(immutable.ts, 338, 86), Decl(immutable.ts, 336, 51), Decl(immutable.ts, 339, 83))
 >V : Symbol(V, Decl(immutable.ts, 405, 29))
 
   export interface Collection<K, V> extends ValueObject {
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 >ValueObject : Symbol(ValueObject, Decl(immutable.ts, 13, 76))
@@ -3226,34 +3226,34 @@ declare module Immutable {
     // Conversion to Collections
     toMap(): Map<K, V>;
 >toMap : Symbol(Collection.toMap, Decl(immutable.ts, 427, 37))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toOrderedMap(): OrderedMap<K, V>;
 >toOrderedMap : Symbol(Collection.toOrderedMap, Decl(immutable.ts, 429, 23))
->OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 108, 3), Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80) ... and 2 more)
+>OrderedMap : Symbol(OrderedMap, Decl(immutable.ts, 111, 3), Decl(immutable.ts, 112, 83), Decl(immutable.ts, 113, 85), Decl(immutable.ts, 114, 80), Decl(immutable.ts, 115, 55) ... and 2 more)
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toSet(): Set<V>;
 >toSet : Symbol(Collection.toSet, Decl(immutable.ts, 430, 37))
->Set : Symbol(Set, Decl(immutable.ts, 127, 3), Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 138, 58))
+>Set : Symbol(Set, Decl(immutable.ts, 135, 3), Decl(immutable.ts, 136, 34), Decl(immutable.ts, 137, 35), Decl(immutable.ts, 127, 3), Decl(immutable.ts, 138, 58))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toOrderedSet(): OrderedSet<V>;
 >toOrderedSet : Symbol(Collection.toOrderedSet, Decl(immutable.ts, 431, 20))
->OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 159, 3), Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 168, 72))
+>OrderedSet : Symbol(OrderedSet, Decl(immutable.ts, 165, 3), Decl(immutable.ts, 166, 48), Decl(immutable.ts, 167, 49), Decl(immutable.ts, 159, 3), Decl(immutable.ts, 168, 72))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toList(): List<V>;
 >toList : Symbol(Collection.toList, Decl(immutable.ts, 432, 34))
->List : Symbol(List, Decl(immutable.ts, 17, 3), Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 24, 60))
+>List : Symbol(List, Decl(immutable.ts, 21, 3), Decl(immutable.ts, 22, 36), Decl(immutable.ts, 23, 37), Decl(immutable.ts, 17, 3), Decl(immutable.ts, 24, 60))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toStack(): Stack<V>;
 >toStack : Symbol(Collection.toStack, Decl(immutable.ts, 433, 22))
->Stack : Symbol(Stack, Decl(immutable.ts, 180, 3), Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 187, 62))
+>Stack : Symbol(Stack, Decl(immutable.ts, 184, 3), Decl(immutable.ts, 185, 38), Decl(immutable.ts, 186, 39), Decl(immutable.ts, 180, 3), Decl(immutable.ts, 187, 62))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     // Conversion to Seq
@@ -3262,21 +3262,21 @@ declare module Immutable {
 
     toKeyedSeq(): Seq.Keyed<K, V>;
 >toKeyedSeq : Symbol(Collection.toKeyedSeq, Decl(immutable.ts, 436, 18))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toIndexedSeq(): Seq.Indexed<V>;
 >toIndexedSeq : Symbol(Collection.toIndexedSeq, Decl(immutable.ts, 437, 34))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     toSetSeq(): Seq.Set<V>;
 >toSetSeq : Symbol(Collection.toSetSeq, Decl(immutable.ts, 438, 35))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Set : Symbol(Seq.Set, Decl(immutable.ts, 297, 5), Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 303, 64))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Set : Symbol(Seq.Set, Decl(immutable.ts, 300, 5), Decl(immutable.ts, 301, 40), Decl(immutable.ts, 302, 41), Decl(immutable.ts, 297, 5), Decl(immutable.ts, 303, 64))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     // Iterators
@@ -3299,20 +3299,20 @@ declare module Immutable {
     // Collections (Seq)
     keySeq(): Seq.Indexed<K>;
 >keySeq : Symbol(Collection.keySeq, Decl(immutable.ts, 443, 40))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 
     valueSeq(): Seq.Indexed<V>;
 >valueSeq : Symbol(Collection.valueSeq, Decl(immutable.ts, 445, 29))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
     entrySeq(): Seq.Indexed<[K, V]>;
 >entrySeq : Symbol(Collection.entrySeq, Decl(immutable.ts, 446, 31))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 281, 5), Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 287, 72))
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Indexed : Symbol(Seq.Indexed, Decl(immutable.ts, 284, 5), Decl(immutable.ts, 285, 48), Decl(immutable.ts, 286, 49), Decl(immutable.ts, 281, 5), Decl(immutable.ts, 287, 72))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
@@ -3328,7 +3328,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 449, 37))
 >M : Symbol(M, Decl(immutable.ts, 449, 8))
 >context : Symbol(context, Decl(immutable.ts, 449, 55))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >M : Symbol(M, Decl(immutable.ts, 449, 8))
 
@@ -3345,7 +3345,7 @@ declare module Immutable {
 >value : Symbol(value, Decl(immutable.ts, 450, 36))
 >F : Symbol(F, Decl(immutable.ts, 450, 11))
 >context : Symbol(context, Decl(immutable.ts, 450, 80))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >F : Symbol(F, Decl(immutable.ts, 450, 11))
 
@@ -3407,10 +3407,10 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 456, 42))
 >G : Symbol(G, Decl(immutable.ts, 456, 12))
 >context : Symbol(context, Decl(immutable.ts, 456, 60))
->Seq : Symbol(Seq, Decl(immutable.ts, 260, 78), Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76) ... and 4 more)
->Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 263, 56), Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51) ... and 1 more)
+>Seq : Symbol(Seq, Decl(immutable.ts, 314, 3), Decl(immutable.ts, 315, 58), Decl(immutable.ts, 316, 81), Decl(immutable.ts, 317, 76), Decl(immutable.ts, 318, 68) ... and 4 more)
+>Keyed : Symbol(Seq.Keyed, Decl(immutable.ts, 264, 26), Decl(immutable.ts, 265, 79), Decl(immutable.ts, 266, 76), Decl(immutable.ts, 267, 51), Decl(immutable.ts, 263, 56) ... and 1 more)
 >G : Symbol(G, Decl(immutable.ts, 456, 12))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >V : Symbol(V, Decl(immutable.ts, 406, 32))
 
@@ -3498,17 +3498,17 @@ declare module Immutable {
 >concat : Symbol(Collection.concat, Decl(immutable.ts, 470, 89))
 >valuesOrCollections : Symbol(valuesOrCollections, Decl(immutable.ts, 472, 11))
 >Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.core.d.ts, --, --))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
     flatten(depth?: number): Collection<any, any>;
 >flatten : Symbol(Collection.flatten, Decl(immutable.ts, 472, 69), Decl(immutable.ts, 473, 50))
 >depth : Symbol(depth, Decl(immutable.ts, 473, 12))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
     flatten(shallow?: boolean): Collection<any, any>;
 >flatten : Symbol(Collection.flatten, Decl(immutable.ts, 472, 69), Decl(immutable.ts, 473, 50))
 >shallow : Symbol(shallow, Decl(immutable.ts, 474, 12))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 
     flatMap<M>(mapper: (value: V, key: K, iter: this) => Iterable<M>, context?: any): Collection<K, M>;
 >flatMap : Symbol(Collection.flatMap, Decl(immutable.ts, 474, 53))
@@ -3522,7 +3522,7 @@ declare module Immutable {
 >Iterable : Symbol(Iterable, Decl(lib.es2015.iterable.d.ts, --, --))
 >M : Symbol(M, Decl(immutable.ts, 475, 12))
 >context : Symbol(context, Decl(immutable.ts, 475, 69))
->Collection : Symbol(Collection, Decl(immutable.ts, 331, 3), Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 405, 86))
+>Collection : Symbol(Collection, Decl(immutable.ts, 402, 3), Decl(immutable.ts, 403, 79), Decl(immutable.ts, 404, 80), Decl(immutable.ts, 331, 3), Decl(immutable.ts, 405, 86))
 >K : Symbol(K, Decl(immutable.ts, 406, 30))
 >M : Symbol(M, Decl(immutable.ts, 475, 12))
 
@@ -3642,7 +3642,7 @@ declare module Immutable {
 >iter : Symbol(iter, Decl(immutable.ts, 487, 42))
 >G : Symbol(G, Decl(immutable.ts, 487, 12))
 >context : Symbol(context, Decl(immutable.ts, 487, 60))
->Map : Symbol(Map, Decl(immutable.ts, 62, 3), Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66) ... and 2 more)
+>Map : Symbol(Map, Decl(immutable.ts, 66, 3), Decl(immutable.ts, 67, 69), Decl(immutable.ts, 68, 71), Decl(immutable.ts, 69, 66), Decl(immutable.ts, 70, 41) ... and 2 more)
 >G : Symbol(G, Decl(immutable.ts, 487, 12))
 
     // Search for value
diff --git a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
index afae9d40431..2ab30ece7a0 100644
--- a/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
+++ b/tests/baselines/reference/conflictingTypeAnnotatedVar.errors.txt
@@ -1,21 +1,27 @@
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(1,5): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,10): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(2,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,10): error TS2300: Duplicate identifier 'foo'.
+tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,10): error TS2393: Duplicate function implementation.
 tests/cases/compiler/conflictingTypeAnnotatedVar.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
 
 
-==== tests/cases/compiler/conflictingTypeAnnotatedVar.ts (5 errors) ====
+==== tests/cases/compiler/conflictingTypeAnnotatedVar.ts (7 errors) ====
     var foo: string;
         ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
     function foo(): number { }
              ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
+             ~~~
+!!! error TS2393: Duplicate function implementation.
                     ~~~~~~
 !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
     function foo(): number { }
              ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
+             ~~~
+!!! error TS2393: Duplicate function implementation.
                     ~~~~~~
 !!! error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
\ No newline at end of file
diff --git a/tests/baselines/reference/conflictingTypeAnnotatedVar.symbols b/tests/baselines/reference/conflictingTypeAnnotatedVar.symbols
index d937d085122..6dee4cef0af 100644
--- a/tests/baselines/reference/conflictingTypeAnnotatedVar.symbols
+++ b/tests/baselines/reference/conflictingTypeAnnotatedVar.symbols
@@ -3,8 +3,8 @@ var foo: string;
 >foo : Symbol(foo, Decl(conflictingTypeAnnotatedVar.ts, 0, 3))
 
 function foo(): number { }
->foo : Symbol(foo, Decl(conflictingTypeAnnotatedVar.ts, 0, 16))
+>foo : Symbol(foo, Decl(conflictingTypeAnnotatedVar.ts, 0, 16), Decl(conflictingTypeAnnotatedVar.ts, 1, 26))
 
 function foo(): number { }
->foo : Symbol(foo, Decl(conflictingTypeAnnotatedVar.ts, 1, 26))
+>foo : Symbol(foo, Decl(conflictingTypeAnnotatedVar.ts, 0, 16), Decl(conflictingTypeAnnotatedVar.ts, 1, 26))
 
diff --git a/tests/baselines/reference/constructorOverloads4.errors.txt b/tests/baselines/reference/constructorOverloads4.errors.txt
index 3e6923d25dc..9a02c67361b 100644
--- a/tests/baselines/reference/constructorOverloads4.errors.txt
+++ b/tests/baselines/reference/constructorOverloads4.errors.txt
@@ -1,11 +1,10 @@
 tests/cases/compiler/constructorOverloads4.ts(2,18): error TS2300: Duplicate identifier 'Function'.
 tests/cases/compiler/constructorOverloads4.ts(5,21): error TS2300: Duplicate identifier 'Function'.
 tests/cases/compiler/constructorOverloads4.ts(6,21): error TS2300: Duplicate identifier 'Function'.
-tests/cases/compiler/constructorOverloads4.ts(10,1): error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'Function' has no compatible call signatures.
-tests/cases/compiler/constructorOverloads4.ts(11,1): error TS2348: Value of type 'typeof Function' is not callable. Did you mean to include 'new'?
+tests/cases/compiler/constructorOverloads4.ts(10,2): error TS2350: Only a void function can be called with the 'new' keyword.
 
 
-==== tests/cases/compiler/constructorOverloads4.ts (5 errors) ====
+==== tests/cases/compiler/constructorOverloads4.ts (4 errors) ====
     declare module M {    
         export class Function {
                      ~~~~~~~~
@@ -22,9 +21,7 @@ tests/cases/compiler/constructorOverloads4.ts(11,1): error TS2348: Value of type
     
     
     (new M.Function("return 5"))();
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2349: Cannot invoke an expression whose type lacks a call signature. Type 'Function' has no compatible call signatures.
+     ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2350: Only a void function can be called with the 'new' keyword.
     M.Function("yo");
-    ~~~~~~~~~~~~~~~~
-!!! error TS2348: Value of type 'typeof Function' is not callable. Did you mean to include 'new'?
     
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorOverloads4.symbols b/tests/baselines/reference/constructorOverloads4.symbols
index 09af88fb8c2..b11d5bb61b8 100644
--- a/tests/baselines/reference/constructorOverloads4.symbols
+++ b/tests/baselines/reference/constructorOverloads4.symbols
@@ -3,29 +3,29 @@ declare module M {
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
 
     export class Function {
->Function : Symbol(Function, Decl(constructorOverloads4.ts, 0, 18))
+>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 0, 18))
 
         constructor(...args: string[]);
 >args : Symbol(args, Decl(constructorOverloads4.ts, 2, 20))
     }
     export function Function(...args: any[]): any;
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 >args : Symbol(args, Decl(constructorOverloads4.ts, 4, 29))
 
     export function Function(...args: string[]): Function;
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 4, 50))
+>Function : Symbol(Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 >args : Symbol(args, Decl(constructorOverloads4.ts, 5, 29))
->Function : Symbol(Function, Decl(constructorOverloads4.ts, 0, 18))
+>Function : Symbol(Function, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --))
 }
 
 
 (new M.Function("return 5"))();
->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 0, 18))
+>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 0, 18))
+>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 
 M.Function("yo");
->M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 0, 18))
+>M.Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 >M : Symbol(M, Decl(constructorOverloads4.ts, 0, 0))
->Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 0, 18))
+>Function : Symbol(M.Function, Decl(constructorOverloads4.ts, 3, 5), Decl(constructorOverloads4.ts, 4, 50))
 
diff --git a/tests/baselines/reference/constructorOverloads4.types b/tests/baselines/reference/constructorOverloads4.types
index 914ca1674c4..a9da7982fce 100644
--- a/tests/baselines/reference/constructorOverloads4.types
+++ b/tests/baselines/reference/constructorOverloads4.types
@@ -3,17 +3,17 @@ declare module M {
 >M : typeof M
 
     export class Function {
->Function : Function
+>Function : M.Function
 
         constructor(...args: string[]);
 >args : string[]
     }
     export function Function(...args: any[]): any;
->Function : (...args: any[]) => any
+>Function : { (...args: any[]): any; (...args: string[]): Function; }
 >args : any[]
 
     export function Function(...args: string[]): Function;
->Function : (...args: string[]) => Function
+>Function : { (...args: any[]): any; (...args: string[]): Function; }
 >args : string[]
 >Function : Function
 }
@@ -21,17 +21,17 @@ declare module M {
 
 (new M.Function("return 5"))();
 >(new M.Function("return 5"))() : any
->(new M.Function("return 5")) : M.Function
->new M.Function("return 5") : M.Function
->M.Function : typeof M.Function
+>(new M.Function("return 5")) : any
+>new M.Function("return 5") : any
+>M.Function : { (...args: any[]): any; (...args: string[]): Function; }
 >M : typeof M
->Function : typeof M.Function
+>Function : { (...args: any[]): any; (...args: string[]): Function; }
 >"return 5" : "return 5"
 
 M.Function("yo");
 >M.Function("yo") : any
->M.Function : typeof M.Function
+>M.Function : { (...args: any[]): any; (...args: string[]): Function; }
 >M : typeof M
->Function : typeof M.Function
+>Function : { (...args: any[]): any; (...args: string[]): Function; }
 >"yo" : "yo"
 
diff --git a/tests/baselines/reference/constructorOverloads7.errors.txt b/tests/baselines/reference/constructorOverloads7.errors.txt
index e3409dbb399..c915b8f9754 100644
--- a/tests/baselines/reference/constructorOverloads7.errors.txt
+++ b/tests/baselines/reference/constructorOverloads7.errors.txt
@@ -1,9 +1,11 @@
 tests/cases/compiler/constructorOverloads7.ts(1,15): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/constructorOverloads7.ts(7,35): error TS2304: Cannot find name 'Point'.
+tests/cases/compiler/constructorOverloads7.ts(8,14): error TS2304: Cannot find name 'Point'.
 tests/cases/compiler/constructorOverloads7.ts(15,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload signatures must all be ambient or non-ambient.
 
 
-==== tests/cases/compiler/constructorOverloads7.ts (3 errors) ====
+==== tests/cases/compiler/constructorOverloads7.ts (5 errors) ====
     declare class Point
                   ~~~~~
 !!! error TS2300: Duplicate identifier 'Point'.
@@ -13,7 +15,11 @@ tests/cases/compiler/constructorOverloads7.ts(22,18): error TS2384: Overload sig
         constructor(x: number, y: number);
     
          add(dx: number, dy: number): Point;
+                                      ~~~~~
+!!! error TS2304: Cannot find name 'Point'.
          origin: Point;
+                 ~~~~~
+!!! error TS2304: Cannot find name 'Point'.
     
     }
     
diff --git a/tests/baselines/reference/constructorOverloads7.symbols b/tests/baselines/reference/constructorOverloads7.symbols
index ccec68b5321..fe2d6cb7817 100644
--- a/tests/baselines/reference/constructorOverloads7.symbols
+++ b/tests/baselines/reference/constructorOverloads7.symbols
@@ -16,11 +16,9 @@ declare class Point
 >add : Symbol(Point.add, Decl(constructorOverloads7.ts, 4, 38))
 >dx : Symbol(dx, Decl(constructorOverloads7.ts, 6, 9))
 >dy : Symbol(dy, Decl(constructorOverloads7.ts, 6, 20))
->Point : Symbol(Point, Decl(constructorOverloads7.ts, 0, 0))
 
      origin: Point;
 >origin : Symbol(Point.origin, Decl(constructorOverloads7.ts, 6, 40))
->Point : Symbol(Point, Decl(constructorOverloads7.ts, 0, 0))
 
 }
 
diff --git a/tests/baselines/reference/constructorOverloads7.types b/tests/baselines/reference/constructorOverloads7.types
index b10866ca695..dca19ebe8f2 100644
--- a/tests/baselines/reference/constructorOverloads7.types
+++ b/tests/baselines/reference/constructorOverloads7.types
@@ -13,14 +13,14 @@ declare class Point
 >y : number
 
      add(dx: number, dy: number): Point;
->add : (dx: number, dy: number) => Point
+>add : (dx: number, dy: number) => any
 >dx : number
 >dy : number
->Point : Point
+>Point : No type information available!
 
      origin: Point;
->origin : Point
->Point : Point
+>origin : any
+>Point : No type information available!
 
 }
 
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index 2e050777bfd..ac2920b8dac 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -1,11 +1,9 @@
 tests/cases/compiler/contextualTyping.ts(189,18): error TS2384: Overload signatures must all be ambient or non-ambient.
-tests/cases/compiler/contextualTyping.ts(197,15): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/contextualTyping.ts(207,10): error TS2300: Duplicate identifier 'Point'.
-tests/cases/compiler/contextualTyping.ts(230,5): error TS2322: Type '{}' is not assignable to type 'B'.
+tests/cases/compiler/contextualTyping.ts(223,5): error TS2322: Type '{}' is not assignable to type 'B'.
   Property 'x' is missing in type '{}'.
 
 
-==== tests/cases/compiler/contextualTyping.ts (4 errors) ====
+==== tests/cases/compiler/contextualTyping.ts (2 errors) ====
     // DEFAULT INTERFACES
     interface IFoo {
         n: number;
@@ -205,8 +203,6 @@ tests/cases/compiler/contextualTyping.ts(230,5): error TS2322: Type '{}' is not
     
     // contextually typing from ambient class declarations
     declare class Point
-                  ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
     {
           constructor(x: number, y: number);
           x: number;
@@ -216,15 +212,6 @@ tests/cases/compiler/contextualTyping.ts(230,5): error TS2322: Type '{}' is not
     
     }
     
-    function Point(x, y) {
-             ~~~~~
-!!! error TS2300: Duplicate identifier 'Point'.
-        this.x = x;
-        this.y = y;
-    
-        return this;
-    }
-    
     Point.origin = new Point(0, 0);
     
     Point.prototype.add = function(dx, dy) {
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index 5a7e2f44453..17ef4814740 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -205,13 +205,6 @@ declare class Point
 
 }
 
-function Point(x, y) {
-    this.x = x;
-    this.y = y;
-
-    return this;
-}
-
 Point.origin = new Point(0, 0);
 
 Point.prototype.add = function(dx, dy) {
@@ -357,11 +350,6 @@ var c12t14 = ({
 });
 function EF1(a, b) { return a + b; }
 var efv = EF1(1, 2);
-function Point(x, y) {
-    this.x = x;
-    this.y = y;
-    return this;
-}
 Point.origin = new Point(0, 0);
 Point.prototype.add = function (dx, dy) {
     return new Point(this.x + dx, this.y + dy);
diff --git a/tests/baselines/reference/contextualTyping.js.map b/tests/baselines/reference/contextualTyping.js.map
index 12b2a0da322..8efe5f9b2d6 100644
--- a/tests/baselines/reference/contextualTyping.js.map
+++ b/tests/baselines/reference/contextualTyping.js.map
@@ -1,2 +1,2 @@
 //// [contextualTyping.js.map]
-{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,eAAe,CAAC,EAAE,CAAC;IACf,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACX,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAEX,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
+{"version":3,"file":"contextualTyping.js","sourceRoot":"","sources":["contextualTyping.ts"],"names":[],"mappings":"AAYA,sCAAsC;AACtC;IAAA;QACI,QAAG,GAAqC,UAAS,CAAC;YAC9C,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IAAD,WAAC;AAAD,CAAC,AAJD,IAIC;AAED,uCAAuC;AACvC,IAAO,IAAI,CAIV;AAJD,WAAO,IAAI;IACI,QAAG,GAAqC,UAAS,CAAC;QACzD,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EAJM,IAAI,KAAJ,IAAI,QAIV;AAED,gCAAgC;AAChC,IAAI,IAAI,GAA0B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC7D,IAAI,IAAI,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAA;AACF,IAAI,IAAI,GAAa,EAAE,CAAC;AACxB,IAAI,IAAI,GAAe,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACxD,IAAI,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClE,IAAI,IAAI,GAAmC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChF,IAAI,IAAI,GAGJ,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9B,IAAI,IAAI,GAAqC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,IAAI,IAAI,GAAe,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AAC/B,IAAI,KAAK,GAAW,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5C,IAAI,KAAK,GAAwC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChF,IAAI,KAAK,GAAS;IACd,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,KAAK,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAEF,qCAAqC;AACrC;IAEI;QACI,IAAI,CAAC,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,CAAC;QACb,CAAC,CAAA;IACL,CAAC;IACL,WAAC;AAAD,CAAC,AAPD,IAOC;AAED,sCAAsC;AACtC,IAAO,IAAI,CAKV;AALD,WAAO,IAAI;IAEP,KAAA,GAAG,GAAG,UAAS,CAAC,EAAE,CAAC;QACf,OAAO,CAAC,CAAC;IACb,CAAC,CAAA;AACL,CAAC,EALM,IAAI,KAAJ,IAAI,QAKV;AAED,+BAA+B;AAC/B,IAAI,IAAyB,CAAC;AAC9B,IAAI,GAAwB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAE9D,kCAAkC;AAClC,IAAI,IAAY,CAAC;AACjB,IAAI,CAAC,CAAC,CAAC,GAAS,CAAC,EAAC,CAAC,EAAE,CAAC,EAAC,CAAC,CAAC;AAuBzB,IAAI,KAAK,GAkBS,CAAC,EAAE,CAAC,CAAC;AAEvB,KAAK,CAAC,EAAE,GAAG,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AACtC,KAAK,CAAC,EAAE,GAAS,CAAC;IACd,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;AACd,KAAK,CAAC,EAAE,GAAG,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC7C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAChD,KAAK,CAAC,EAAE,GAAG,UAAS,CAAS,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAE5C,KAAK,CAAC,EAAE,GAAG,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACnB,KAAK,CAAC,GAAG,GAAG,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACpC,KAAK,CAAC,GAAG,GAAG,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3C,KAAK,CAAC,GAAG,GAAG;IACR,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,KAAK,CAAC,GAAG,GAAS,CAAC;IACf,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AACF,yBAAyB;AACzB,cAAc,CAAsB,IAAG,CAAC;AAAA,CAAC;AACzC,IAAI,CAAC,UAAS,CAAC;IACX,OAAa,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,4BAA4B;AAC5B,IAAI,KAAK,GAA8B,cAAa,OAAO,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC;AAE/F,0BAA0B;AAC1B;IAAc,eAAY,CAAsB;IAAI,CAAC;IAAC,YAAC;AAAD,CAAC,AAAvD,IAAuD;AAAA,CAAC;AACxD,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAErD,qCAAqC;AACrC,IAAI,KAAK,GAA2B,CAAC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAC;AAC/D,IAAI,KAAK,GAAU,CAAC;IAChB,CAAC,EAAE,CAAC;CACP,CAAC,CAAC;AACH,IAAI,KAAK,GAAc,EAAE,CAAC;AAC1B,IAAI,KAAK,GAAgB,cAAa,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAC1D,IAAI,KAAK,GAAyB,UAAS,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AACpE,IAAI,KAAK,GAAoC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAa,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,CAAC;AAClF,IAAI,KAAK,GAGN,UAAS,CAAQ,IAAI,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC;AAEnC,IAAI,KAAK,GAAsC,UAAS,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,IAAI,KAAK,GAAgB,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;AACjC,IAAI,MAAM,GAAY,CAAO,CAAC,EAAE,CAAC,EAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,IAAI,MAAM,GAAyC,CAAC,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,IAAI,MAAM,GAAU;IAChB,GAAG,EAAQ,CAAC,EAAE,CAAC;CAClB,CAAA;AACD,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,UAAS,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;CAClC,CAAC,CAAA;AACF,IAAI,MAAM,GAAU,CAAC;IACjB,CAAC,EAAE,EAAE;CACR,CAAC,CAAA;AAOF,aAAa,CAAC,EAAC,CAAC,IAAI,OAAO,CAAC,GAAC,CAAC,CAAC,CAAC,CAAC;AAEjC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC;AAcnB,KAAK,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE/B,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,UAAS,EAAE,EAAE,EAAE;IACjC,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,KAAK,CAAC,SAAS,GAAG;IACd,CAAC,EAAE,CAAC;IACJ,CAAC,EAAE,CAAC;IACJ,GAAG,EAAE,UAAS,EAAE,EAAE,EAAE;QAChB,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAC;AAIF,IAAI,CAAC,GAAM,EAAG,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index e70ee9e3344..88b31442644 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -3077,7 +3077,7 @@ sourceFile:contextualTyping.ts
 9 >                 ^
 10>                  ^
 11>                   ^
-12>                    ^^^->
+12>                    ^^^^^^^^^^^^->
 1 >
   >
   >
@@ -3103,113 +3103,6 @@ sourceFile:contextualTyping.ts
 10>Emitted(125, 20) Source(193, 19) + SourceIndex(0)
 11>Emitted(125, 21) Source(193, 20) + SourceIndex(0)
 ---
->>>function Point(x, y) {
-1->
-2 >^^^^^^^^^^^^^^^
-3 >               ^
-4 >                ^^
-5 >                  ^
-1->
-  >
-  >
-  >// contextually typing from ambient class declarations
-  >declare class Point
-  >{
-  >      constructor(x: number, y: number);
-  >      x: number;
-  >      y: number;
-  >      add(dx: number, dy: number): Point;
-  >      static origin: Point;
-  >
-  >}
-  >
-  >
-2 >function Point(
-3 >               x
-4 >                , 
-5 >                  y
-1->Emitted(126, 1) Source(207, 1) + SourceIndex(0)
-2 >Emitted(126, 16) Source(207, 16) + SourceIndex(0)
-3 >Emitted(126, 17) Source(207, 17) + SourceIndex(0)
-4 >Emitted(126, 19) Source(207, 19) + SourceIndex(0)
-5 >Emitted(126, 20) Source(207, 20) + SourceIndex(0)
----
->>>    this.x = x;
-1 >^^^^
-2 >    ^^^^
-3 >        ^
-4 >         ^
-5 >          ^^^
-6 >             ^
-7 >              ^
-8 >               ^->
-1 >) {
-  >    
-2 >    this
-3 >        .
-4 >         x
-5 >           = 
-6 >             x
-7 >              ;
-1 >Emitted(127, 5) Source(208, 5) + SourceIndex(0)
-2 >Emitted(127, 9) Source(208, 9) + SourceIndex(0)
-3 >Emitted(127, 10) Source(208, 10) + SourceIndex(0)
-4 >Emitted(127, 11) Source(208, 11) + SourceIndex(0)
-5 >Emitted(127, 14) Source(208, 14) + SourceIndex(0)
-6 >Emitted(127, 15) Source(208, 15) + SourceIndex(0)
-7 >Emitted(127, 16) Source(208, 16) + SourceIndex(0)
----
->>>    this.y = y;
-1->^^^^
-2 >    ^^^^
-3 >        ^
-4 >         ^
-5 >          ^^^
-6 >             ^
-7 >              ^
-8 >               ^^->
-1->
-  >    
-2 >    this
-3 >        .
-4 >         y
-5 >           = 
-6 >             y
-7 >              ;
-1->Emitted(128, 5) Source(209, 5) + SourceIndex(0)
-2 >Emitted(128, 9) Source(209, 9) + SourceIndex(0)
-3 >Emitted(128, 10) Source(209, 10) + SourceIndex(0)
-4 >Emitted(128, 11) Source(209, 11) + SourceIndex(0)
-5 >Emitted(128, 14) Source(209, 14) + SourceIndex(0)
-6 >Emitted(128, 15) Source(209, 15) + SourceIndex(0)
-7 >Emitted(128, 16) Source(209, 16) + SourceIndex(0)
----
->>>    return this;
-1->^^^^
-2 >    ^^^^^^^
-3 >           ^^^^
-4 >               ^
-1->
-  >
-  >    
-2 >    return 
-3 >           this
-4 >               ;
-1->Emitted(129, 5) Source(211, 5) + SourceIndex(0)
-2 >Emitted(129, 12) Source(211, 12) + SourceIndex(0)
-3 >Emitted(129, 16) Source(211, 16) + SourceIndex(0)
-4 >Emitted(129, 17) Source(211, 17) + SourceIndex(0)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >
-2 >}
-1 >Emitted(130, 1) Source(212, 1) + SourceIndex(0)
-2 >Emitted(130, 2) Source(212, 2) + SourceIndex(0)
----
 >>>Point.origin = new Point(0, 0);
 1->
 2 >^^^^^
@@ -3226,6 +3119,18 @@ sourceFile:contextualTyping.ts
 13>                              ^
 14>                               ^^^^^^^^^^^->
 1->
+  >
+  >
+  >// contextually typing from ambient class declarations
+  >declare class Point
+  >{
+  >      constructor(x: number, y: number);
+  >      x: number;
+  >      y: number;
+  >      add(dx: number, dy: number): Point;
+  >      static origin: Point;
+  >
+  >}
   >
   >
 2 >Point
@@ -3240,19 +3145,19 @@ sourceFile:contextualTyping.ts
 11>                            0
 12>                             )
 13>                              ;
-1->Emitted(131, 1) Source(214, 1) + SourceIndex(0)
-2 >Emitted(131, 6) Source(214, 6) + SourceIndex(0)
-3 >Emitted(131, 7) Source(214, 7) + SourceIndex(0)
-4 >Emitted(131, 13) Source(214, 13) + SourceIndex(0)
-5 >Emitted(131, 16) Source(214, 16) + SourceIndex(0)
-6 >Emitted(131, 20) Source(214, 20) + SourceIndex(0)
-7 >Emitted(131, 25) Source(214, 25) + SourceIndex(0)
-8 >Emitted(131, 26) Source(214, 26) + SourceIndex(0)
-9 >Emitted(131, 27) Source(214, 27) + SourceIndex(0)
-10>Emitted(131, 29) Source(214, 29) + SourceIndex(0)
-11>Emitted(131, 30) Source(214, 30) + SourceIndex(0)
-12>Emitted(131, 31) Source(214, 31) + SourceIndex(0)
-13>Emitted(131, 32) Source(214, 32) + SourceIndex(0)
+1->Emitted(126, 1) Source(207, 1) + SourceIndex(0)
+2 >Emitted(126, 6) Source(207, 6) + SourceIndex(0)
+3 >Emitted(126, 7) Source(207, 7) + SourceIndex(0)
+4 >Emitted(126, 13) Source(207, 13) + SourceIndex(0)
+5 >Emitted(126, 16) Source(207, 16) + SourceIndex(0)
+6 >Emitted(126, 20) Source(207, 20) + SourceIndex(0)
+7 >Emitted(126, 25) Source(207, 25) + SourceIndex(0)
+8 >Emitted(126, 26) Source(207, 26) + SourceIndex(0)
+9 >Emitted(126, 27) Source(207, 27) + SourceIndex(0)
+10>Emitted(126, 29) Source(207, 29) + SourceIndex(0)
+11>Emitted(126, 30) Source(207, 30) + SourceIndex(0)
+12>Emitted(126, 31) Source(207, 31) + SourceIndex(0)
+13>Emitted(126, 32) Source(207, 32) + SourceIndex(0)
 ---
 >>>Point.prototype.add = function (dx, dy) {
 1->
@@ -3280,17 +3185,17 @@ sourceFile:contextualTyping.ts
 9 >                                dx
 10>                                  , 
 11>                                    dy
-1->Emitted(132, 1) Source(216, 1) + SourceIndex(0)
-2 >Emitted(132, 6) Source(216, 6) + SourceIndex(0)
-3 >Emitted(132, 7) Source(216, 7) + SourceIndex(0)
-4 >Emitted(132, 16) Source(216, 16) + SourceIndex(0)
-5 >Emitted(132, 17) Source(216, 17) + SourceIndex(0)
-6 >Emitted(132, 20) Source(216, 20) + SourceIndex(0)
-7 >Emitted(132, 23) Source(216, 23) + SourceIndex(0)
-8 >Emitted(132, 33) Source(216, 32) + SourceIndex(0)
-9 >Emitted(132, 35) Source(216, 34) + SourceIndex(0)
-10>Emitted(132, 37) Source(216, 36) + SourceIndex(0)
-11>Emitted(132, 39) Source(216, 38) + SourceIndex(0)
+1->Emitted(127, 1) Source(209, 1) + SourceIndex(0)
+2 >Emitted(127, 6) Source(209, 6) + SourceIndex(0)
+3 >Emitted(127, 7) Source(209, 7) + SourceIndex(0)
+4 >Emitted(127, 16) Source(209, 16) + SourceIndex(0)
+5 >Emitted(127, 17) Source(209, 17) + SourceIndex(0)
+6 >Emitted(127, 20) Source(209, 20) + SourceIndex(0)
+7 >Emitted(127, 23) Source(209, 23) + SourceIndex(0)
+8 >Emitted(127, 33) Source(209, 32) + SourceIndex(0)
+9 >Emitted(127, 35) Source(209, 34) + SourceIndex(0)
+10>Emitted(127, 37) Source(209, 36) + SourceIndex(0)
+11>Emitted(127, 39) Source(209, 38) + SourceIndex(0)
 ---
 >>>    return new Point(this.x + dx, this.y + dy);
 1->^^^^
@@ -3330,24 +3235,24 @@ sourceFile:contextualTyping.ts
 16>                                           dy
 17>                                             )
 18>                                              ;
-1->Emitted(133, 5) Source(217, 5) + SourceIndex(0)
-2 >Emitted(133, 12) Source(217, 12) + SourceIndex(0)
-3 >Emitted(133, 16) Source(217, 16) + SourceIndex(0)
-4 >Emitted(133, 21) Source(217, 21) + SourceIndex(0)
-5 >Emitted(133, 22) Source(217, 22) + SourceIndex(0)
-6 >Emitted(133, 26) Source(217, 26) + SourceIndex(0)
-7 >Emitted(133, 27) Source(217, 27) + SourceIndex(0)
-8 >Emitted(133, 28) Source(217, 28) + SourceIndex(0)
-9 >Emitted(133, 31) Source(217, 31) + SourceIndex(0)
-10>Emitted(133, 33) Source(217, 33) + SourceIndex(0)
-11>Emitted(133, 35) Source(217, 35) + SourceIndex(0)
-12>Emitted(133, 39) Source(217, 39) + SourceIndex(0)
-13>Emitted(133, 40) Source(217, 40) + SourceIndex(0)
-14>Emitted(133, 41) Source(217, 41) + SourceIndex(0)
-15>Emitted(133, 44) Source(217, 44) + SourceIndex(0)
-16>Emitted(133, 46) Source(217, 46) + SourceIndex(0)
-17>Emitted(133, 47) Source(217, 47) + SourceIndex(0)
-18>Emitted(133, 48) Source(217, 48) + SourceIndex(0)
+1->Emitted(128, 5) Source(210, 5) + SourceIndex(0)
+2 >Emitted(128, 12) Source(210, 12) + SourceIndex(0)
+3 >Emitted(128, 16) Source(210, 16) + SourceIndex(0)
+4 >Emitted(128, 21) Source(210, 21) + SourceIndex(0)
+5 >Emitted(128, 22) Source(210, 22) + SourceIndex(0)
+6 >Emitted(128, 26) Source(210, 26) + SourceIndex(0)
+7 >Emitted(128, 27) Source(210, 27) + SourceIndex(0)
+8 >Emitted(128, 28) Source(210, 28) + SourceIndex(0)
+9 >Emitted(128, 31) Source(210, 31) + SourceIndex(0)
+10>Emitted(128, 33) Source(210, 33) + SourceIndex(0)
+11>Emitted(128, 35) Source(210, 35) + SourceIndex(0)
+12>Emitted(128, 39) Source(210, 39) + SourceIndex(0)
+13>Emitted(128, 40) Source(210, 40) + SourceIndex(0)
+14>Emitted(128, 41) Source(210, 41) + SourceIndex(0)
+15>Emitted(128, 44) Source(210, 44) + SourceIndex(0)
+16>Emitted(128, 46) Source(210, 46) + SourceIndex(0)
+17>Emitted(128, 47) Source(210, 47) + SourceIndex(0)
+18>Emitted(128, 48) Source(210, 48) + SourceIndex(0)
 ---
 >>>};
 1 >
@@ -3358,9 +3263,9 @@ sourceFile:contextualTyping.ts
   >
 2 >}
 3 > ;
-1 >Emitted(134, 1) Source(218, 1) + SourceIndex(0)
-2 >Emitted(134, 2) Source(218, 2) + SourceIndex(0)
-3 >Emitted(134, 3) Source(218, 3) + SourceIndex(0)
+1 >Emitted(129, 1) Source(211, 1) + SourceIndex(0)
+2 >Emitted(129, 2) Source(211, 2) + SourceIndex(0)
+3 >Emitted(129, 3) Source(211, 3) + SourceIndex(0)
 ---
 >>>Point.prototype = {
 1->
@@ -3375,11 +3280,11 @@ sourceFile:contextualTyping.ts
 3 >     .
 4 >      prototype
 5 >                = 
-1->Emitted(135, 1) Source(220, 1) + SourceIndex(0)
-2 >Emitted(135, 6) Source(220, 6) + SourceIndex(0)
-3 >Emitted(135, 7) Source(220, 7) + SourceIndex(0)
-4 >Emitted(135, 16) Source(220, 16) + SourceIndex(0)
-5 >Emitted(135, 19) Source(220, 19) + SourceIndex(0)
+1->Emitted(130, 1) Source(213, 1) + SourceIndex(0)
+2 >Emitted(130, 6) Source(213, 6) + SourceIndex(0)
+3 >Emitted(130, 7) Source(213, 7) + SourceIndex(0)
+4 >Emitted(130, 16) Source(213, 16) + SourceIndex(0)
+5 >Emitted(130, 19) Source(213, 19) + SourceIndex(0)
 ---
 >>>    x: 0,
 1 >^^^^
@@ -3392,10 +3297,10 @@ sourceFile:contextualTyping.ts
 2 >    x
 3 >     : 
 4 >       0
-1 >Emitted(136, 5) Source(221, 5) + SourceIndex(0)
-2 >Emitted(136, 6) Source(221, 6) + SourceIndex(0)
-3 >Emitted(136, 8) Source(221, 8) + SourceIndex(0)
-4 >Emitted(136, 9) Source(221, 9) + SourceIndex(0)
+1 >Emitted(131, 5) Source(214, 5) + SourceIndex(0)
+2 >Emitted(131, 6) Source(214, 6) + SourceIndex(0)
+3 >Emitted(131, 8) Source(214, 8) + SourceIndex(0)
+4 >Emitted(131, 9) Source(214, 9) + SourceIndex(0)
 ---
 >>>    y: 0,
 1->^^^^
@@ -3408,10 +3313,10 @@ sourceFile:contextualTyping.ts
 2 >    y
 3 >     : 
 4 >       0
-1->Emitted(137, 5) Source(222, 5) + SourceIndex(0)
-2 >Emitted(137, 6) Source(222, 6) + SourceIndex(0)
-3 >Emitted(137, 8) Source(222, 8) + SourceIndex(0)
-4 >Emitted(137, 9) Source(222, 9) + SourceIndex(0)
+1->Emitted(132, 5) Source(215, 5) + SourceIndex(0)
+2 >Emitted(132, 6) Source(215, 6) + SourceIndex(0)
+3 >Emitted(132, 8) Source(215, 8) + SourceIndex(0)
+4 >Emitted(132, 9) Source(215, 9) + SourceIndex(0)
 ---
 >>>    add: function (dx, dy) {
 1->^^^^
@@ -3430,13 +3335,13 @@ sourceFile:contextualTyping.ts
 5 >                   dx
 6 >                     , 
 7 >                       dy
-1->Emitted(138, 5) Source(223, 5) + SourceIndex(0)
-2 >Emitted(138, 8) Source(223, 8) + SourceIndex(0)
-3 >Emitted(138, 10) Source(223, 10) + SourceIndex(0)
-4 >Emitted(138, 20) Source(223, 19) + SourceIndex(0)
-5 >Emitted(138, 22) Source(223, 21) + SourceIndex(0)
-6 >Emitted(138, 24) Source(223, 23) + SourceIndex(0)
-7 >Emitted(138, 26) Source(223, 25) + SourceIndex(0)
+1->Emitted(133, 5) Source(216, 5) + SourceIndex(0)
+2 >Emitted(133, 8) Source(216, 8) + SourceIndex(0)
+3 >Emitted(133, 10) Source(216, 10) + SourceIndex(0)
+4 >Emitted(133, 20) Source(216, 19) + SourceIndex(0)
+5 >Emitted(133, 22) Source(216, 21) + SourceIndex(0)
+6 >Emitted(133, 24) Source(216, 23) + SourceIndex(0)
+7 >Emitted(133, 26) Source(216, 25) + SourceIndex(0)
 ---
 >>>        return new Point(this.x + dx, this.y + dy);
 1->^^^^^^^^
@@ -3476,24 +3381,24 @@ sourceFile:contextualTyping.ts
 16>                                               dy
 17>                                                 )
 18>                                                  ;
-1->Emitted(139, 9) Source(224, 9) + SourceIndex(0)
-2 >Emitted(139, 16) Source(224, 16) + SourceIndex(0)
-3 >Emitted(139, 20) Source(224, 20) + SourceIndex(0)
-4 >Emitted(139, 25) Source(224, 25) + SourceIndex(0)
-5 >Emitted(139, 26) Source(224, 26) + SourceIndex(0)
-6 >Emitted(139, 30) Source(224, 30) + SourceIndex(0)
-7 >Emitted(139, 31) Source(224, 31) + SourceIndex(0)
-8 >Emitted(139, 32) Source(224, 32) + SourceIndex(0)
-9 >Emitted(139, 35) Source(224, 35) + SourceIndex(0)
-10>Emitted(139, 37) Source(224, 37) + SourceIndex(0)
-11>Emitted(139, 39) Source(224, 39) + SourceIndex(0)
-12>Emitted(139, 43) Source(224, 43) + SourceIndex(0)
-13>Emitted(139, 44) Source(224, 44) + SourceIndex(0)
-14>Emitted(139, 45) Source(224, 45) + SourceIndex(0)
-15>Emitted(139, 48) Source(224, 48) + SourceIndex(0)
-16>Emitted(139, 50) Source(224, 50) + SourceIndex(0)
-17>Emitted(139, 51) Source(224, 51) + SourceIndex(0)
-18>Emitted(139, 52) Source(224, 52) + SourceIndex(0)
+1->Emitted(134, 9) Source(217, 9) + SourceIndex(0)
+2 >Emitted(134, 16) Source(217, 16) + SourceIndex(0)
+3 >Emitted(134, 20) Source(217, 20) + SourceIndex(0)
+4 >Emitted(134, 25) Source(217, 25) + SourceIndex(0)
+5 >Emitted(134, 26) Source(217, 26) + SourceIndex(0)
+6 >Emitted(134, 30) Source(217, 30) + SourceIndex(0)
+7 >Emitted(134, 31) Source(217, 31) + SourceIndex(0)
+8 >Emitted(134, 32) Source(217, 32) + SourceIndex(0)
+9 >Emitted(134, 35) Source(217, 35) + SourceIndex(0)
+10>Emitted(134, 37) Source(217, 37) + SourceIndex(0)
+11>Emitted(134, 39) Source(217, 39) + SourceIndex(0)
+12>Emitted(134, 43) Source(217, 43) + SourceIndex(0)
+13>Emitted(134, 44) Source(217, 44) + SourceIndex(0)
+14>Emitted(134, 45) Source(217, 45) + SourceIndex(0)
+15>Emitted(134, 48) Source(217, 48) + SourceIndex(0)
+16>Emitted(134, 50) Source(217, 50) + SourceIndex(0)
+17>Emitted(134, 51) Source(217, 51) + SourceIndex(0)
+18>Emitted(134, 52) Source(217, 52) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -3501,8 +3406,8 @@ sourceFile:contextualTyping.ts
 1 >
   >    
 2 >    }
-1 >Emitted(140, 5) Source(225, 5) + SourceIndex(0)
-2 >Emitted(140, 6) Source(225, 6) + SourceIndex(0)
+1 >Emitted(135, 5) Source(218, 5) + SourceIndex(0)
+2 >Emitted(135, 6) Source(218, 6) + SourceIndex(0)
 ---
 >>>};
 1 >^
@@ -3511,8 +3416,8 @@ sourceFile:contextualTyping.ts
 1 >
   >}
 2 > ;
-1 >Emitted(141, 2) Source(226, 2) + SourceIndex(0)
-2 >Emitted(141, 3) Source(226, 3) + SourceIndex(0)
+1 >Emitted(136, 2) Source(219, 2) + SourceIndex(0)
+2 >Emitted(136, 3) Source(219, 3) + SourceIndex(0)
 ---
 >>>var x = {};
 1->
@@ -3532,11 +3437,11 @@ sourceFile:contextualTyping.ts
 4 >     : B = 
 5 >        { }
 6 >          ;
-1->Emitted(142, 1) Source(230, 1) + SourceIndex(0)
-2 >Emitted(142, 5) Source(230, 5) + SourceIndex(0)
-3 >Emitted(142, 6) Source(230, 6) + SourceIndex(0)
-4 >Emitted(142, 9) Source(230, 12) + SourceIndex(0)
-5 >Emitted(142, 11) Source(230, 15) + SourceIndex(0)
-6 >Emitted(142, 12) Source(230, 16) + SourceIndex(0)
+1->Emitted(137, 1) Source(223, 1) + SourceIndex(0)
+2 >Emitted(137, 5) Source(223, 5) + SourceIndex(0)
+3 >Emitted(137, 6) Source(223, 6) + SourceIndex(0)
+4 >Emitted(137, 9) Source(223, 12) + SourceIndex(0)
+5 >Emitted(137, 11) Source(223, 15) + SourceIndex(0)
+6 >Emitted(137, 12) Source(223, 16) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.symbols b/tests/baselines/reference/contextualTyping.symbols
index 07a33a3da3e..2b516cd8da0 100644
--- a/tests/baselines/reference/contextualTyping.symbols
+++ b/tests/baselines/reference/contextualTyping.symbols
@@ -659,20 +659,6 @@ declare class Point
 
 }
 
-function Point(x, y) {
->Point : Symbol(Point, Decl(contextualTyping.ts, 204, 1))
->x : Symbol(x, Decl(contextualTyping.ts, 206, 15))
->y : Symbol(y, Decl(contextualTyping.ts, 206, 17))
-
-    this.x = x;
->x : Symbol(x, Decl(contextualTyping.ts, 206, 15))
-
-    this.y = y;
->y : Symbol(y, Decl(contextualTyping.ts, 206, 17))
-
-    return this;
-}
-
 Point.origin = new Point(0, 0);
 >Point.origin : Symbol(Point.origin, Decl(contextualTyping.ts, 201, 41))
 >Point : Symbol(Point, Decl(contextualTyping.ts, 192, 19))
@@ -685,13 +671,13 @@ Point.prototype.add = function(dx, dy) {
 >Point : Symbol(Point, Decl(contextualTyping.ts, 192, 19))
 >prototype : Symbol(Point.prototype)
 >add : Symbol(Point.add, Decl(contextualTyping.ts, 200, 16))
->dx : Symbol(dx, Decl(contextualTyping.ts, 215, 31))
->dy : Symbol(dy, Decl(contextualTyping.ts, 215, 34))
+>dx : Symbol(dx, Decl(contextualTyping.ts, 208, 31))
+>dy : Symbol(dy, Decl(contextualTyping.ts, 208, 34))
 
     return new Point(this.x + dx, this.y + dy);
 >Point : Symbol(Point, Decl(contextualTyping.ts, 192, 19))
->dx : Symbol(dx, Decl(contextualTyping.ts, 215, 31))
->dy : Symbol(dy, Decl(contextualTyping.ts, 215, 34))
+>dx : Symbol(dx, Decl(contextualTyping.ts, 208, 31))
+>dy : Symbol(dy, Decl(contextualTyping.ts, 208, 34))
 
 };
 
@@ -701,32 +687,32 @@ Point.prototype = {
 >prototype : Symbol(Point.prototype)
 
     x: 0,
->x : Symbol(x, Decl(contextualTyping.ts, 219, 19))
+>x : Symbol(x, Decl(contextualTyping.ts, 212, 19))
 
     y: 0,
->y : Symbol(y, Decl(contextualTyping.ts, 220, 9))
+>y : Symbol(y, Decl(contextualTyping.ts, 213, 9))
 
     add: function(dx, dy) {
->add : Symbol(add, Decl(contextualTyping.ts, 221, 9))
->dx : Symbol(dx, Decl(contextualTyping.ts, 222, 18))
->dy : Symbol(dy, Decl(contextualTyping.ts, 222, 21))
+>add : Symbol(add, Decl(contextualTyping.ts, 214, 9))
+>dx : Symbol(dx, Decl(contextualTyping.ts, 215, 18))
+>dy : Symbol(dy, Decl(contextualTyping.ts, 215, 21))
 
         return new Point(this.x + dx, this.y + dy);
 >Point : Symbol(Point, Decl(contextualTyping.ts, 192, 19))
->dx : Symbol(dx, Decl(contextualTyping.ts, 222, 18))
->dy : Symbol(dy, Decl(contextualTyping.ts, 222, 21))
+>dx : Symbol(dx, Decl(contextualTyping.ts, 215, 18))
+>dy : Symbol(dy, Decl(contextualTyping.ts, 215, 21))
     }
 };
 
 interface A { x: string; }
->A : Symbol(A, Decl(contextualTyping.ts, 225, 2))
->x : Symbol(A.x, Decl(contextualTyping.ts, 227, 13))
+>A : Symbol(A, Decl(contextualTyping.ts, 218, 2))
+>x : Symbol(A.x, Decl(contextualTyping.ts, 220, 13))
 
 interface B extends A { }
->B : Symbol(B, Decl(contextualTyping.ts, 227, 26))
->A : Symbol(A, Decl(contextualTyping.ts, 225, 2))
+>B : Symbol(B, Decl(contextualTyping.ts, 220, 26))
+>A : Symbol(A, Decl(contextualTyping.ts, 218, 2))
 
 var x: B = { };
->x : Symbol(x, Decl(contextualTyping.ts, 229, 3))
->B : Symbol(B, Decl(contextualTyping.ts, 227, 26))
+>x : Symbol(x, Decl(contextualTyping.ts, 222, 3))
+>B : Symbol(B, Decl(contextualTyping.ts, 220, 26))
 
diff --git a/tests/baselines/reference/contextualTyping.types b/tests/baselines/reference/contextualTyping.types
index c2379425e1e..7ff503f7291 100644
--- a/tests/baselines/reference/contextualTyping.types
+++ b/tests/baselines/reference/contextualTyping.types
@@ -860,29 +860,6 @@ declare class Point
 
 }
 
-function Point(x, y) {
->Point : (x: any, y: any) => any
->x : any
->y : any
-
-    this.x = x;
->this.x = x : any
->this.x : any
->this : any
->x : any
->x : any
-
-    this.y = y;
->this.y = y : any
->this.y : any
->this : any
->y : any
->y : any
-
-    return this;
->this : any
-}
-
 Point.origin = new Point(0, 0);
 >Point.origin = new Point(0, 0) : Point
 >Point.origin : Point
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
index 0e8a128c712..84168043c4a 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
@@ -100,7 +100,7 @@ module M {
 >M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
 
     module F {
->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 47, 10), Decl(duplicateSymbolsExportMatching.ts, 50, 5))
+>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5), Decl(duplicateSymbolsExportMatching.ts, 47, 10))
 
         var t;
 >t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 49, 11))
diff --git a/tests/baselines/reference/exportClassExtendingIntersection.symbols b/tests/baselines/reference/exportClassExtendingIntersection.symbols
index b22febb7d72..01b502e28be 100644
--- a/tests/baselines/reference/exportClassExtendingIntersection.symbols
+++ b/tests/baselines/reference/exportClassExtendingIntersection.symbols
@@ -22,14 +22,14 @@ import { Constructor, MyBaseClass } from './BaseClass';
 >MyBaseClass : Symbol(MyBaseClass, Decl(MixinClass.ts, 0, 21))
 
 export interface MyMixin {
->MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 0, 55), Decl(MixinClass.ts, 4, 1))
+>MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 4, 1), Decl(MixinClass.ts, 0, 55))
 
     mixinProperty: string;
 >mixinProperty : Symbol(MyMixin.mixinProperty, Decl(MixinClass.ts, 2, 26))
 }
 
 export function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & Constructor<MyMixin> {
->MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 0, 55), Decl(MixinClass.ts, 4, 1))
+>MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 4, 1), Decl(MixinClass.ts, 0, 55))
 >T : Symbol(T, Decl(MixinClass.ts, 6, 24))
 >Constructor : Symbol(Constructor, Decl(MixinClass.ts, 0, 8))
 >MyBaseClass : Symbol(MyBaseClass, Decl(MixinClass.ts, 0, 21))
@@ -37,7 +37,7 @@ export function MyMixin<T extends Constructor<MyBaseClass<any>>>(base: T): T & C
 >T : Symbol(T, Decl(MixinClass.ts, 6, 24))
 >T : Symbol(T, Decl(MixinClass.ts, 6, 24))
 >Constructor : Symbol(Constructor, Decl(MixinClass.ts, 0, 8))
->MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 0, 55), Decl(MixinClass.ts, 4, 1))
+>MyMixin : Symbol(MyMixin, Decl(MixinClass.ts, 4, 1), Decl(MixinClass.ts, 0, 55))
 
     return class extends base {
 >base : Symbol(base, Decl(MixinClass.ts, 6, 65))
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.symbols b/tests/baselines/reference/exportRedeclarationTypeAliases.symbols
index 6561692e307..1b91e58141b 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.symbols
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.symbols
@@ -1,10 +1,10 @@
 === tests/cases/compiler/exportRedeclarationTypeAliases.ts ===
 export type Foo = number;
->Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30), Decl(exportRedeclarationTypeAliases.ts, 0, 0))
 
 export function Foo(): number;
->Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30), Decl(exportRedeclarationTypeAliases.ts, 0, 0))
 
 export function Foo(): any {}
->Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 0), Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30))
+>Foo : Symbol(Foo, Decl(exportRedeclarationTypeAliases.ts, 0, 25), Decl(exportRedeclarationTypeAliases.ts, 1, 30), Decl(exportRedeclarationTypeAliases.ts, 0, 0))
 
diff --git a/tests/baselines/reference/funClodule.errors.txt b/tests/baselines/reference/funClodule.errors.txt
index 72a9ed0db51..c55e7391bfe 100644
--- a/tests/baselines/reference/funClodule.errors.txt
+++ b/tests/baselines/reference/funClodule.errors.txt
@@ -2,14 +2,13 @@ tests/cases/compiler/funClodule.ts(1,18): error TS2300: Duplicate identifier 'fo
 tests/cases/compiler/funClodule.ts(2,16): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/funClodule.ts(5,15): error TS2300: Duplicate identifier 'foo'.
 tests/cases/compiler/funClodule.ts(8,15): error TS2300: Duplicate identifier 'foo2'.
-tests/cases/compiler/funClodule.ts(9,16): error TS2300: Duplicate identifier 'foo2'.
 tests/cases/compiler/funClodule.ts(12,18): error TS2300: Duplicate identifier 'foo2'.
 tests/cases/compiler/funClodule.ts(15,10): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(16,8): error TS2300: Duplicate identifier 'foo3'.
 tests/cases/compiler/funClodule.ts(19,7): error TS2300: Duplicate identifier 'foo3'.
 
 
-==== tests/cases/compiler/funClodule.ts (9 errors) ====
+==== tests/cases/compiler/funClodule.ts (8 errors) ====
     declare function foo();
                      ~~~
 !!! error TS2300: Duplicate identifier 'foo'.
@@ -27,8 +26,6 @@ tests/cases/compiler/funClodule.ts(19,7): error TS2300: Duplicate identifier 'fo
                   ~~~~
 !!! error TS2300: Duplicate identifier 'foo2'.
     declare module foo2 {
-                   ~~~~
-!!! error TS2300: Duplicate identifier 'foo2'.
         export function x(): any;
     }
     declare function foo2(); // Should error
diff --git a/tests/baselines/reference/funClodule.symbols b/tests/baselines/reference/funClodule.symbols
index 6ebec50ab5c..4e342b4bac3 100644
--- a/tests/baselines/reference/funClodule.symbols
+++ b/tests/baselines/reference/funClodule.symbols
@@ -13,16 +13,16 @@ declare class foo { } // Should error
 
 
 declare class foo2 { }
->foo2 : Symbol(foo2, Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 4, 21))
 
 declare module foo2 {
->foo2 : Symbol(foo2, Decl(funClodule.ts, 4, 21), Decl(funClodule.ts, 7, 22))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 7, 22))
 
     export function x(): any;
 >x : Symbol(x, Decl(funClodule.ts, 8, 21))
 }
 declare function foo2(); // Should error
->foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1))
+>foo2 : Symbol(foo2, Decl(funClodule.ts, 10, 1), Decl(funClodule.ts, 7, 22))
 
 
 function foo3() { }
diff --git a/tests/baselines/reference/funClodule.types b/tests/baselines/reference/funClodule.types
index 170b85b3411..b63b15725c7 100644
--- a/tests/baselines/reference/funClodule.types
+++ b/tests/baselines/reference/funClodule.types
@@ -22,7 +22,7 @@ declare module foo2 {
 >x : () => any
 }
 declare function foo2(); // Should error
->foo2 : () => any
+>foo2 : typeof foo2
 
 
 function foo3() { }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.symbols b/tests/baselines/reference/functionAndImportNameConflict.symbols
index 078801933fa..45adb29612d 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.symbols
+++ b/tests/baselines/reference/functionAndImportNameConflict.symbols
@@ -5,7 +5,7 @@ export function f() {
 
 === tests/cases/compiler/f2.ts ===
 import {f} from './f1';
->f : Symbol(f, Decl(f2.ts, 0, 8), Decl(f2.ts, 0, 23))
+>f : Symbol(f, Decl(f2.ts, 0, 23), Decl(f2.ts, 0, 8))
 
 export function f() {
 >f : Symbol(f, Decl(f2.ts, 0, 23))
diff --git a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.symbols b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.symbols
index aa51fad0538..f0f57896473 100644
--- a/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.symbols
+++ b/tests/baselines/reference/functionDeclarationWithResolutionOfTypeOfSameName01.symbols
@@ -1,12 +1,12 @@
 === tests/cases/compiler/functionDeclarationWithResolutionOfTypeOfSameName01.ts ===
 interface f {
->f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1))
+>f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0))
 }
 
 function f() {
->f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1))
+>f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0))
 
     <f>f;
->f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1))
->f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1))
+>f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0))
+>f : Symbol(f, Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 1, 1), Decl(functionDeclarationWithResolutionOfTypeOfSameName01.ts, 0, 0))
 }
diff --git a/tests/baselines/reference/inferringClassMembersFromAssignments2.symbols b/tests/baselines/reference/inferringClassMembersFromAssignments2.symbols
new file mode 100644
index 00000000000..72f04fe0401
--- /dev/null
+++ b/tests/baselines/reference/inferringClassMembersFromAssignments2.symbols
@@ -0,0 +1,19 @@
+=== tests/cases/conformance/salsa/a.js ===
+OOOrder.prototype.m = function () {
+>OOOrder.prototype : Symbol(OOOrder.m, Decl(a.js, 0, 0))
+>OOOrder : Symbol(OOOrder, Decl(a.js, 2, 1))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>m : Symbol(OOOrder.m, Decl(a.js, 0, 0))
+
+    this.p = 1
+>this.p : Symbol(OOOrder.p, Decl(a.js, 0, 35))
+>this : Symbol(OOOrder, Decl(a.js, 2, 1))
+>p : Symbol(OOOrder.p, Decl(a.js, 0, 35))
+}
+function OOOrder() {
+>OOOrder : Symbol(OOOrder, Decl(a.js, 2, 1))
+
+    this.x = 1
+>x : Symbol(OOOrder.x, Decl(a.js, 3, 20))
+}
+
diff --git a/tests/baselines/reference/inferringClassMembersFromAssignments2.types b/tests/baselines/reference/inferringClassMembersFromAssignments2.types
new file mode 100644
index 00000000000..8af847de9e6
--- /dev/null
+++ b/tests/baselines/reference/inferringClassMembersFromAssignments2.types
@@ -0,0 +1,28 @@
+=== tests/cases/conformance/salsa/a.js ===
+OOOrder.prototype.m = function () {
+>OOOrder.prototype.m = function () {    this.p = 1} : () => void
+>OOOrder.prototype.m : any
+>OOOrder.prototype : any
+>OOOrder : () => void
+>prototype : any
+>m : any
+>function () {    this.p = 1} : () => void
+
+    this.p = 1
+>this.p = 1 : 1
+>this.p : number
+>this : { x: number; m: () => void; p: number; }
+>p : number
+>1 : 1
+}
+function OOOrder() {
+>OOOrder : () => void
+
+    this.x = 1
+>this.x = 1 : 1
+>this.x : any
+>this : any
+>x : any
+>1 : 1
+}
+
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
index c5b4e795cf6..25af733e40f 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.symbols
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsx/inline/renderer.d.ts ===
 export namespace dom {
->dom : Symbol(dom, Decl(renderer.d.ts, 0, 0), Decl(renderer.d.ts, 17, 1))
+>dom : Symbol(dom, Decl(renderer.d.ts, 17, 1), Decl(renderer.d.ts, 0, 0))
 
     namespace JSX {
 >JSX : Symbol(JSX, Decl(renderer.d.ts, 0, 22))
@@ -44,14 +44,14 @@ export namespace dom {
     }
 }
 export function dom(): dom.JSX.Element;
->dom : Symbol(dom, Decl(renderer.d.ts, 0, 0), Decl(renderer.d.ts, 17, 1))
->dom : Symbol(dom, Decl(renderer.d.ts, 0, 0), Decl(renderer.d.ts, 17, 1))
+>dom : Symbol(dom, Decl(renderer.d.ts, 17, 1), Decl(renderer.d.ts, 0, 0))
+>dom : Symbol(dom, Decl(renderer.d.ts, 17, 1), Decl(renderer.d.ts, 0, 0))
 >JSX : Symbol(dom.JSX, Decl(renderer.d.ts, 0, 22))
 >Element : Symbol(dom.JSX.Element, Decl(renderer.d.ts, 4, 9))
 
 === tests/cases/conformance/jsx/inline/renderer2.d.ts ===
 export namespace predom {
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 17, 1))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 17, 1), Decl(renderer2.d.ts, 0, 0))
 
     namespace JSX {
 >JSX : Symbol(JSX, Decl(renderer2.d.ts, 0, 25))
@@ -95,8 +95,8 @@ export namespace predom {
     }
 }
 export function predom(): predom.JSX.Element;
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 17, 1))
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 17, 1))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 17, 1), Decl(renderer2.d.ts, 0, 0))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 17, 1), Decl(renderer2.d.ts, 0, 0))
 >JSX : Symbol(predom.JSX, Decl(renderer2.d.ts, 0, 25))
 >Element : Symbol(predom.JSX.Element, Decl(renderer2.d.ts, 4, 9))
 
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.symbols b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.symbols
index c4962015871..9e246795292 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.symbols
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.symbols
@@ -40,7 +40,7 @@ export function dom(): JSX.Element;
 
 === tests/cases/conformance/jsx/inline/renderer2.d.ts ===
 export namespace predom {
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 13, 1))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 13, 1), Decl(renderer2.d.ts, 0, 0))
 
     namespace JSX {
 >JSX : Symbol(JSX, Decl(renderer2.d.ts, 0, 25))
@@ -74,8 +74,8 @@ export namespace predom {
     }
 }
 export function predom(): predom.JSX.Element;
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 13, 1))
->predom : Symbol(predom, Decl(renderer2.d.ts, 0, 0), Decl(renderer2.d.ts, 13, 1))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 13, 1), Decl(renderer2.d.ts, 0, 0))
+>predom : Symbol(predom, Decl(renderer2.d.ts, 13, 1), Decl(renderer2.d.ts, 0, 0))
 >JSX : Symbol(predom.JSX, Decl(renderer2.d.ts, 0, 25))
 >Element : Symbol(predom.JSX.Element, Decl(renderer2.d.ts, 4, 9))
 
diff --git a/tests/baselines/reference/interfaceDeclaration2.symbols b/tests/baselines/reference/interfaceDeclaration2.symbols
index e8588107355..d4aa80327fa 100644
--- a/tests/baselines/reference/interfaceDeclaration2.symbols
+++ b/tests/baselines/reference/interfaceDeclaration2.symbols
@@ -12,10 +12,10 @@ class I2 { }
 >I2 : Symbol(I2, Decl(interfaceDeclaration2.ts, 1, 13), Decl(interfaceDeclaration2.ts, 3, 16))
 
 interface I3 { }
->I3 : Symbol(I3, Decl(interfaceDeclaration2.ts, 4, 12), Decl(interfaceDeclaration2.ts, 6, 16))
+>I3 : Symbol(I3, Decl(interfaceDeclaration2.ts, 6, 16), Decl(interfaceDeclaration2.ts, 4, 12))
 
 function I3() { }
->I3 : Symbol(I3, Decl(interfaceDeclaration2.ts, 4, 12), Decl(interfaceDeclaration2.ts, 6, 16))
+>I3 : Symbol(I3, Decl(interfaceDeclaration2.ts, 6, 16), Decl(interfaceDeclaration2.ts, 4, 12))
 
 interface I4 { }
 >I4 : Symbol(I4, Decl(interfaceDeclaration2.ts, 7, 17), Decl(interfaceDeclaration2.ts, 10, 3))
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersection.symbols b/tests/baselines/reference/interfaceExtendsObjectIntersection.symbols
index 2c353036af2..5086fa2b55a 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersection.symbols
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersection.symbols
@@ -61,55 +61,55 @@ interface I7 extends T7 { x: string }
 >x : Symbol(I7.x, Decl(interfaceExtendsObjectIntersection.ts, 14, 25))
 
 type Constructor<T> = new () => T;
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersection.ts, 16, 17))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersection.ts, 16, 17))
 
 declare function Constructor<T>(): Constructor<T>;
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersection.ts, 17, 29))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersection.ts, 17, 29))
 
 class C1 extends Constructor<I1>() { x: string }
 >C1 : Symbol(C1, Decl(interfaceExtendsObjectIntersection.ts, 17, 50))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I1 : Symbol(I1, Decl(interfaceExtendsObjectIntersection.ts, 6, 45))
 >x : Symbol(C1.x, Decl(interfaceExtendsObjectIntersection.ts, 19, 36))
 
 class C2 extends Constructor<I2>() { x: string }
 >C2 : Symbol(C2, Decl(interfaceExtendsObjectIntersection.ts, 19, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I2 : Symbol(I2, Decl(interfaceExtendsObjectIntersection.ts, 8, 37))
 >x : Symbol(C2.x, Decl(interfaceExtendsObjectIntersection.ts, 20, 36))
 
 class C3 extends Constructor<I3>() { x: string }
 >C3 : Symbol(C3, Decl(interfaceExtendsObjectIntersection.ts, 20, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I3 : Symbol(I3, Decl(interfaceExtendsObjectIntersection.ts, 9, 37))
 >x : Symbol(C3.x, Decl(interfaceExtendsObjectIntersection.ts, 21, 36))
 
 class C4 extends Constructor<I4>() { x: string }
 >C4 : Symbol(C4, Decl(interfaceExtendsObjectIntersection.ts, 21, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I4 : Symbol(I4, Decl(interfaceExtendsObjectIntersection.ts, 10, 37))
 >x : Symbol(C4.x, Decl(interfaceExtendsObjectIntersection.ts, 22, 36))
 
 class C5 extends Constructor<I5>() { x: string }
 >C5 : Symbol(C5, Decl(interfaceExtendsObjectIntersection.ts, 22, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I5 : Symbol(I5, Decl(interfaceExtendsObjectIntersection.ts, 11, 37))
 >x : Symbol(C5.x, Decl(interfaceExtendsObjectIntersection.ts, 23, 36))
 
 class C6 extends Constructor<I6>() { x: string }
 >C6 : Symbol(C6, Decl(interfaceExtendsObjectIntersection.ts, 23, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I6 : Symbol(I6, Decl(interfaceExtendsObjectIntersection.ts, 12, 37))
 >x : Symbol(C6.x, Decl(interfaceExtendsObjectIntersection.ts, 24, 36))
 
 class C7 extends Constructor<I7>() { x: string }
 >C7 : Symbol(C7, Decl(interfaceExtendsObjectIntersection.ts, 24, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >I7 : Symbol(I7, Decl(interfaceExtendsObjectIntersection.ts, 13, 37))
 >x : Symbol(C7.x, Decl(interfaceExtendsObjectIntersection.ts, 25, 36))
 
@@ -200,28 +200,28 @@ interface I23 extends Identifiable<T1 & { b: number}> { x: string }
 
 class C20 extends Constructor<Partial<T1>>() { x: string }
 >C20 : Symbol(C20, Decl(interfaceExtendsObjectIntersection.ts, 47, 67))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >Partial : Symbol(Partial, Decl(lib.d.ts, --, --))
 >T1 : Symbol(T1, Decl(interfaceExtendsObjectIntersection.ts, 0, 0))
 >x : Symbol(C20.x, Decl(interfaceExtendsObjectIntersection.ts, 49, 46))
 
 class C21 extends Constructor<Readonly<T1>>() { x: string }
 >C21 : Symbol(C21, Decl(interfaceExtendsObjectIntersection.ts, 49, 58))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >Readonly : Symbol(Readonly, Decl(lib.d.ts, --, --))
 >T1 : Symbol(T1, Decl(interfaceExtendsObjectIntersection.ts, 0, 0))
 >x : Symbol(C21.x, Decl(interfaceExtendsObjectIntersection.ts, 50, 47))
 
 class C22 extends Constructor<Identifiable<T1>>() { x: string }
 >C22 : Symbol(C22, Decl(interfaceExtendsObjectIntersection.ts, 50, 59))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >Identifiable : Symbol(Identifiable, Decl(interfaceExtendsObjectIntersection.ts, 40, 39))
 >T1 : Symbol(T1, Decl(interfaceExtendsObjectIntersection.ts, 0, 0))
 >x : Symbol(C22.x, Decl(interfaceExtendsObjectIntersection.ts, 51, 51))
 
 class C23 extends Constructor<Identifiable<T1 & { b: number}>>() { x: string }
 >C23 : Symbol(C23, Decl(interfaceExtendsObjectIntersection.ts, 51, 63))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 14, 37), Decl(interfaceExtendsObjectIntersection.ts, 16, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersection.ts, 16, 34), Decl(interfaceExtendsObjectIntersection.ts, 14, 37))
 >Identifiable : Symbol(Identifiable, Decl(interfaceExtendsObjectIntersection.ts, 40, 39))
 >T1 : Symbol(T1, Decl(interfaceExtendsObjectIntersection.ts, 0, 0))
 >b : Symbol(b, Decl(interfaceExtendsObjectIntersection.ts, 52, 49))
diff --git a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
index ade96a3c486..bb3b22a660b 100644
--- a/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
+++ b/tests/baselines/reference/interfaceExtendsObjectIntersectionErrors.symbols
@@ -44,43 +44,43 @@ interface I5 extends T5 { c: number }
 >c : Symbol(I5.c, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 25))
 
 type Constructor<T> = new () => T;
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 17))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 17))
 
 declare function Constructor<T>(): Constructor<T>;
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersectionErrors.ts, 13, 29))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T : Symbol(T, Decl(interfaceExtendsObjectIntersectionErrors.ts, 13, 29))
 
 class C1 extends Constructor<T1>() { a: string }
 >C1 : Symbol(C1, Decl(interfaceExtendsObjectIntersectionErrors.ts, 13, 50))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T1 : Symbol(T1, Decl(interfaceExtendsObjectIntersectionErrors.ts, 0, 0))
 >a : Symbol(C1.a, Decl(interfaceExtendsObjectIntersectionErrors.ts, 15, 36))
 
 class C2 extends Constructor<T2>() { b: string }
 >C2 : Symbol(C2, Decl(interfaceExtendsObjectIntersectionErrors.ts, 15, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T2 : Symbol(T2, Decl(interfaceExtendsObjectIntersectionErrors.ts, 0, 24))
 >b : Symbol(C2.b, Decl(interfaceExtendsObjectIntersectionErrors.ts, 16, 36))
 
 class C3 extends Constructor<T3>() { length: string }
 >C3 : Symbol(C3, Decl(interfaceExtendsObjectIntersectionErrors.ts, 16, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T3 : Symbol(T3, Decl(interfaceExtendsObjectIntersectionErrors.ts, 1, 29))
 >length : Symbol(C3.length, Decl(interfaceExtendsObjectIntersectionErrors.ts, 17, 36))
 
 class C4 extends Constructor<T4>() { 0: number }
 >C4 : Symbol(C4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 17, 53))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T4 : Symbol(T4, Decl(interfaceExtendsObjectIntersectionErrors.ts, 2, 19))
 >0 : Symbol(C4[0], Decl(interfaceExtendsObjectIntersectionErrors.ts, 18, 36))
 
 class C5 extends Constructor<T5>() { c: number }
 >C5 : Symbol(C5, Decl(interfaceExtendsObjectIntersectionErrors.ts, 18, 48))
->Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37), Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34))
+>Constructor : Symbol(Constructor, Decl(interfaceExtendsObjectIntersectionErrors.ts, 12, 34), Decl(interfaceExtendsObjectIntersectionErrors.ts, 10, 37))
 >T5 : Symbol(T5, Decl(interfaceExtendsObjectIntersectionErrors.ts, 3, 27))
 >c : Symbol(C5.c, Decl(interfaceExtendsObjectIntersectionErrors.ts, 19, 36))
 
diff --git a/tests/baselines/reference/invariantGenericErrorElaboration.symbols b/tests/baselines/reference/invariantGenericErrorElaboration.symbols
index 9c141e5c27f..cc493d8e51a 100644
--- a/tests/baselines/reference/invariantGenericErrorElaboration.symbols
+++ b/tests/baselines/reference/invariantGenericErrorElaboration.symbols
@@ -8,7 +8,7 @@ const wat: Runtype<any> = Num;
 
 const Foo = Obj({ foo: Num })
 >Foo : Symbol(Foo, Decl(invariantGenericErrorElaboration.ts, 3, 5))
->Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 13, 22), Decl(invariantGenericErrorElaboration.ts, 15, 111))
+>Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 15, 111), Decl(invariantGenericErrorElaboration.ts, 13, 22))
 >foo : Symbol(foo, Decl(invariantGenericErrorElaboration.ts, 3, 17))
 >Num : Symbol(Num, Decl(invariantGenericErrorElaboration.ts, 8, 1), Decl(invariantGenericErrorElaboration.ts, 13, 13))
 
@@ -37,7 +37,7 @@ declare const Num: Num
 >Num : Symbol(Num, Decl(invariantGenericErrorElaboration.ts, 8, 1), Decl(invariantGenericErrorElaboration.ts, 13, 13))
 
 interface Obj<O extends { [_ in string]: Runtype<any> }> extends Runtype<{[K in keyof O]: O[K]['witness'] }> {}
->Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 13, 22), Decl(invariantGenericErrorElaboration.ts, 15, 111))
+>Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 15, 111), Decl(invariantGenericErrorElaboration.ts, 13, 22))
 >O : Symbol(O, Decl(invariantGenericErrorElaboration.ts, 15, 14))
 >_ : Symbol(_, Decl(invariantGenericErrorElaboration.ts, 15, 27))
 >Runtype : Symbol(Runtype, Decl(invariantGenericErrorElaboration.ts, 3, 29))
@@ -48,13 +48,13 @@ interface Obj<O extends { [_ in string]: Runtype<any> }> extends Runtype<{[K in
 >K : Symbol(K, Decl(invariantGenericErrorElaboration.ts, 15, 75))
 
 declare function Obj<O extends { [_: string]: Runtype<any> }>(fields: O): Obj<O>;
->Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 13, 22), Decl(invariantGenericErrorElaboration.ts, 15, 111))
+>Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 15, 111), Decl(invariantGenericErrorElaboration.ts, 13, 22))
 >O : Symbol(O, Decl(invariantGenericErrorElaboration.ts, 16, 21))
 >_ : Symbol(_, Decl(invariantGenericErrorElaboration.ts, 16, 34))
 >Runtype : Symbol(Runtype, Decl(invariantGenericErrorElaboration.ts, 3, 29))
 >fields : Symbol(fields, Decl(invariantGenericErrorElaboration.ts, 16, 62))
 >O : Symbol(O, Decl(invariantGenericErrorElaboration.ts, 16, 21))
->Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 13, 22), Decl(invariantGenericErrorElaboration.ts, 15, 111))
+>Obj : Symbol(Obj, Decl(invariantGenericErrorElaboration.ts, 15, 111), Decl(invariantGenericErrorElaboration.ts, 13, 22))
 >O : Symbol(O, Decl(invariantGenericErrorElaboration.ts, 16, 21))
 
 interface Constraint<A extends Runtype<any>> extends Runtype<A['witness']> {
diff --git a/tests/baselines/reference/letAndVarRedeclaration.errors.txt b/tests/baselines/reference/letAndVarRedeclaration.errors.txt
index 19f0b8faf8e..09d12f6fa4a 100644
--- a/tests/baselines/reference/letAndVarRedeclaration.errors.txt
+++ b/tests/baselines/reference/letAndVarRedeclaration.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/letAndVarRedeclaration.ts(1,5): error TS2451: Cannot redeclare block-scoped variable 'e0'.
-tests/cases/compiler/letAndVarRedeclaration.ts(2,5): error TS2451: Cannot redeclare block-scoped variable 'e0'.
-tests/cases/compiler/letAndVarRedeclaration.ts(3,10): error TS2451: Cannot redeclare block-scoped variable 'e0'.
-tests/cases/compiler/letAndVarRedeclaration.ts(6,9): error TS2451: Cannot redeclare block-scoped variable 'x1'.
-tests/cases/compiler/letAndVarRedeclaration.ts(7,9): error TS2451: Cannot redeclare block-scoped variable 'x1'.
-tests/cases/compiler/letAndVarRedeclaration.ts(8,14): error TS2451: Cannot redeclare block-scoped variable 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(1,5): error TS2300: Duplicate identifier 'e0'.
+tests/cases/compiler/letAndVarRedeclaration.ts(2,5): error TS2300: Duplicate identifier 'e0'.
+tests/cases/compiler/letAndVarRedeclaration.ts(3,10): error TS2300: Duplicate identifier 'e0'.
+tests/cases/compiler/letAndVarRedeclaration.ts(6,9): error TS2300: Duplicate identifier 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(7,9): error TS2300: Duplicate identifier 'x1'.
+tests/cases/compiler/letAndVarRedeclaration.ts(8,14): error TS2300: Duplicate identifier 'x1'.
 tests/cases/compiler/letAndVarRedeclaration.ts(12,9): error TS2451: Cannot redeclare block-scoped variable 'x'.
 tests/cases/compiler/letAndVarRedeclaration.ts(14,13): error TS2451: Cannot redeclare block-scoped variable 'x'.
 tests/cases/compiler/letAndVarRedeclaration.ts(17,18): error TS2451: Cannot redeclare block-scoped variable 'x'.
-tests/cases/compiler/letAndVarRedeclaration.ts(22,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(23,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
-tests/cases/compiler/letAndVarRedeclaration.ts(24,14): error TS2451: Cannot redeclare block-scoped variable 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(22,9): error TS2300: Duplicate identifier 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(23,9): error TS2300: Duplicate identifier 'x2'.
+tests/cases/compiler/letAndVarRedeclaration.ts(24,14): error TS2300: Duplicate identifier 'x2'.
 tests/cases/compiler/letAndVarRedeclaration.ts(28,9): error TS2451: Cannot redeclare block-scoped variable 'x2'.
 tests/cases/compiler/letAndVarRedeclaration.ts(30,13): error TS2451: Cannot redeclare block-scoped variable 'x2'.
 tests/cases/compiler/letAndVarRedeclaration.ts(33,18): error TS2451: Cannot redeclare block-scoped variable 'x2'.
@@ -24,24 +24,24 @@ tests/cases/compiler/letAndVarRedeclaration.ts(49,14): error TS2451: Cannot rede
 ==== tests/cases/compiler/letAndVarRedeclaration.ts (21 errors) ====
     let e0
         ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'e0'.
+!!! error TS2300: Duplicate identifier 'e0'.
     var e0;
         ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'e0'.
+!!! error TS2300: Duplicate identifier 'e0'.
     function e0() { }
              ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'e0'.
+!!! error TS2300: Duplicate identifier 'e0'.
     
     function f0() {
         let x1;
             ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x1'.
+!!! error TS2300: Duplicate identifier 'x1'.
         var x1;
             ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x1'.
+!!! error TS2300: Duplicate identifier 'x1'.
         function x1() { }
                  ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x1'.
+!!! error TS2300: Duplicate identifier 'x1'.
     }
     
     function f1() {
@@ -63,13 +63,13 @@ tests/cases/compiler/letAndVarRedeclaration.ts(49,14): error TS2451: Cannot rede
     module M0 {
         let x2;
             ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x2'.
+!!! error TS2300: Duplicate identifier 'x2'.
         var x2;
             ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x2'.
+!!! error TS2300: Duplicate identifier 'x2'.
         function x2() { }
                  ~~
-!!! error TS2451: Cannot redeclare block-scoped variable 'x2'.
+!!! error TS2300: Duplicate identifier 'x2'.
     }
     
     module M1 {
diff --git a/tests/baselines/reference/mixinClassesAnnotated.symbols b/tests/baselines/reference/mixinClassesAnnotated.symbols
index 419428e6c53..826842b66c3 100644
--- a/tests/baselines/reference/mixinClassesAnnotated.symbols
+++ b/tests/baselines/reference/mixinClassesAnnotated.symbols
@@ -69,20 +69,20 @@ const Printable = <T extends Constructor<Base>>(superClass: T): Constructor<Prin
     }
 
 interface Tagged {
->Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 22, 5), Decl(mixinClassesAnnotated.ts, 26, 1))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 26, 1), Decl(mixinClassesAnnotated.ts, 22, 5))
 
     _tag: string;
 >_tag : Symbol(Tagged._tag, Decl(mixinClassesAnnotated.ts, 24, 18))
 }
 
 function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> & T {
->Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 22, 5), Decl(mixinClassesAnnotated.ts, 26, 1))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 26, 1), Decl(mixinClassesAnnotated.ts, 22, 5))
 >T : Symbol(T, Decl(mixinClassesAnnotated.ts, 28, 16))
 >Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
 >superClass : Symbol(superClass, Decl(mixinClassesAnnotated.ts, 28, 43))
 >T : Symbol(T, Decl(mixinClassesAnnotated.ts, 28, 16))
 >Constructor : Symbol(Constructor, Decl(mixinClassesAnnotated.ts, 0, 0))
->Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 22, 5), Decl(mixinClassesAnnotated.ts, 26, 1))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 26, 1), Decl(mixinClassesAnnotated.ts, 22, 5))
 >T : Symbol(T, Decl(mixinClassesAnnotated.ts, 28, 16))
 
     class C extends superClass {
@@ -111,12 +111,12 @@ function Tagged<T extends Constructor<{}>>(superClass: T): Constructor<Tagged> &
 
 const Thing1 = Tagged(Derived);
 >Thing1 : Symbol(Thing1, Decl(mixinClassesAnnotated.ts, 39, 5))
->Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 22, 5), Decl(mixinClassesAnnotated.ts, 26, 1))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 26, 1), Decl(mixinClassesAnnotated.ts, 22, 5))
 >Derived : Symbol(Derived, Decl(mixinClassesAnnotated.ts, 4, 1))
 
 const Thing2 = Tagged(Printable(Derived));
 >Thing2 : Symbol(Thing2, Decl(mixinClassesAnnotated.ts, 40, 5))
->Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 22, 5), Decl(mixinClassesAnnotated.ts, 26, 1))
+>Tagged : Symbol(Tagged, Decl(mixinClassesAnnotated.ts, 26, 1), Decl(mixinClassesAnnotated.ts, 22, 5))
 >Printable : Symbol(Printable, Decl(mixinClassesAnnotated.ts, 10, 1), Decl(mixinClassesAnnotated.ts, 16, 5))
 >Derived : Symbol(Derived, Decl(mixinClassesAnnotated.ts, 4, 1))
 
diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols b/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols
index 9fc43fd4ac0..f9f1f3bffc7 100644
--- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols
+++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.symbols
@@ -3,13 +3,13 @@ module A {
 >A : Symbol(A, Decl(mixingFunctionAndAmbientModule1.ts, 0, 0))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 0, 10), Decl(mixingFunctionAndAmbientModule1.ts, 3, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 10))
 
         export var x: number;
 >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 2, 18))
     }
     function My(s: string) { }
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 0, 10), Decl(mixingFunctionAndAmbientModule1.ts, 3, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 3, 5), Decl(mixingFunctionAndAmbientModule1.ts, 0, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 4, 16))
 }
 
@@ -17,17 +17,17 @@ module B {
 >B : Symbol(B, Decl(mixingFunctionAndAmbientModule1.ts, 5, 1))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 7, 10), Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10))
 
         export var x: number;
 >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 9, 18))
     }
     function My(s: boolean);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 7, 10), Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 11, 16))
 
     function My(s: any) { }
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 7, 10), Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 10, 5), Decl(mixingFunctionAndAmbientModule1.ts, 11, 28), Decl(mixingFunctionAndAmbientModule1.ts, 7, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 12, 16))
 }
 
@@ -35,13 +35,13 @@ module C {
 >C : Symbol(C, Decl(mixingFunctionAndAmbientModule1.ts, 13, 1))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 15, 10), Decl(mixingFunctionAndAmbientModule1.ts, 18, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 10))
 
         export var x: number;
 >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 17, 18))
     }
     declare function My(s: boolean);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 15, 10), Decl(mixingFunctionAndAmbientModule1.ts, 18, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 18, 5), Decl(mixingFunctionAndAmbientModule1.ts, 15, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 19, 24))
 }
 
@@ -49,17 +49,17 @@ module D {
 >D : Symbol(D, Decl(mixingFunctionAndAmbientModule1.ts, 20, 1))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 22, 10), Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10))
 
         export var x: number;
 >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 24, 18))
     }
     declare function My(s: boolean);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 22, 10), Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 26, 24))
 
     declare function My(s: any);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 22, 10), Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 25, 5), Decl(mixingFunctionAndAmbientModule1.ts, 26, 36), Decl(mixingFunctionAndAmbientModule1.ts, 22, 10))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 27, 24))
 }
 
@@ -68,23 +68,23 @@ module E {
 >E : Symbol(E, Decl(mixingFunctionAndAmbientModule1.ts, 28, 1))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36))
 
         export var x: number;
 >x : Symbol(x, Decl(mixingFunctionAndAmbientModule1.ts, 33, 18))
     }
     declare function My(s: boolean);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 35, 24))
 
     declare module My {
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36))
 
         export var y: number;
 >y : Symbol(y, Decl(mixingFunctionAndAmbientModule1.ts, 37, 18))
     }
     declare function My(s: any);
->My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5))
+>My : Symbol(My, Decl(mixingFunctionAndAmbientModule1.ts, 34, 5), Decl(mixingFunctionAndAmbientModule1.ts, 38, 5), Decl(mixingFunctionAndAmbientModule1.ts, 31, 10), Decl(mixingFunctionAndAmbientModule1.ts, 35, 36))
 >s : Symbol(s, Decl(mixingFunctionAndAmbientModule1.ts, 39, 24))
 }
 
diff --git a/tests/baselines/reference/multipleDefaultExports01.errors.txt b/tests/baselines/reference/multipleDefaultExports01.errors.txt
index eff0203387c..a60374943df 100644
--- a/tests/baselines/reference/multipleDefaultExports01.errors.txt
+++ b/tests/baselines/reference/multipleDefaultExports01.errors.txt
@@ -1,7 +1,6 @@
 tests/cases/conformance/es6/modules/m1.ts(1,22): error TS2528: A module cannot have multiple default exports.
 tests/cases/conformance/es6/modules/m1.ts(5,25): error TS2528: A module cannot have multiple default exports.
 tests/cases/conformance/es6/modules/m1.ts(10,16): error TS2528: A module cannot have multiple default exports.
-tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typeof foo' is not callable. Did you mean to include 'new'?
 
 
 ==== tests/cases/conformance/es6/modules/m1.ts (3 errors) ====
@@ -22,9 +21,7 @@ tests/cases/conformance/es6/modules/m2.ts(3,1): error TS2348: Value of type 'typ
                    ~
 !!! error TS2528: A module cannot have multiple default exports.
     
-==== tests/cases/conformance/es6/modules/m2.ts (1 errors) ====
+==== tests/cases/conformance/es6/modules/m2.ts (0 errors) ====
     import Entity from "./m1"
     
-    Entity();
-    ~~~~~~~~
-!!! error TS2348: Value of type 'typeof foo' is not callable. Did you mean to include 'new'?
\ No newline at end of file
+    Entity();
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDefaultExports01.types b/tests/baselines/reference/multipleDefaultExports01.types
index 585a0631cc3..175296722ef 100644
--- a/tests/baselines/reference/multipleDefaultExports01.types
+++ b/tests/baselines/reference/multipleDefaultExports01.types
@@ -18,9 +18,9 @@ export default x;
 
 === tests/cases/conformance/es6/modules/m2.ts ===
 import Entity from "./m1"
->Entity : typeof Entity
+>Entity : () => void
 
 Entity();
->Entity() : any
->Entity : typeof Entity
+>Entity() : void
+>Entity : () => void
 
diff --git a/tests/baselines/reference/nonMergedOverloads.errors.txt b/tests/baselines/reference/nonMergedOverloads.errors.txt
index b21a471ea8c..6aa6dfa0930 100644
--- a/tests/baselines/reference/nonMergedOverloads.errors.txt
+++ b/tests/baselines/reference/nonMergedOverloads.errors.txt
@@ -1,17 +1,17 @@
-tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2300: Duplicate identifier 'f'.
-tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2300: Duplicate identifier 'f'.
-tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2300: Duplicate identifier 'f'.
+tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
+tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
+tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
 
 
 ==== tests/cases/compiler/nonMergedOverloads.ts (3 errors) ====
     var f = 10;
         ~
-!!! error TS2300: Duplicate identifier 'f'.
+!!! error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
     
     export function f();
                     ~
-!!! error TS2300: Duplicate identifier 'f'.
+!!! error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
     export function f() {
                     ~
-!!! error TS2300: Duplicate identifier 'f'.
+!!! error TS2395: Individual declarations in merged declaration 'f' must be all exported or all local.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/nonMergedOverloads.symbols b/tests/baselines/reference/nonMergedOverloads.symbols
index 3e0beff1737..51ff3b779aa 100644
--- a/tests/baselines/reference/nonMergedOverloads.symbols
+++ b/tests/baselines/reference/nonMergedOverloads.symbols
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nonMergedOverloads.ts ===
 var f = 10;
->f : Symbol(f, Decl(nonMergedOverloads.ts, 0, 3))
+>f : Symbol(f, Decl(nonMergedOverloads.ts, 0, 11), Decl(nonMergedOverloads.ts, 2, 20), Decl(nonMergedOverloads.ts, 0, 3))
 
 export function f();
 >f : Symbol(f, Decl(nonMergedOverloads.ts, 0, 11), Decl(nonMergedOverloads.ts, 2, 20))
diff --git a/tests/baselines/reference/partiallyAmbientFundule.symbols b/tests/baselines/reference/partiallyAmbientFundule.symbols
index 547c3348085..24c905e258c 100644
--- a/tests/baselines/reference/partiallyAmbientFundule.symbols
+++ b/tests/baselines/reference/partiallyAmbientFundule.symbols
@@ -1,10 +1,10 @@
 === tests/cases/compiler/partiallyAmbientFundule.ts ===
 declare module foo {
->foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 0, 0), Decl(partiallyAmbientFundule.ts, 2, 1))
+>foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 2, 1), Decl(partiallyAmbientFundule.ts, 0, 0))
 
     export function x(): any;
 >x : Symbol(x, Decl(partiallyAmbientFundule.ts, 0, 20))
 }
 function foo () { } // Legal, because module is ambient
->foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 0, 0), Decl(partiallyAmbientFundule.ts, 2, 1))
+>foo : Symbol(foo, Decl(partiallyAmbientFundule.ts, 2, 1), Decl(partiallyAmbientFundule.ts, 0, 0))
 
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols
index 943f32d6dad..51ed7ec7747 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.symbols
@@ -1,18 +1,18 @@
 === tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts ===
 export = Foo;
->Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
 
 interface Foo<T> {
->Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
 >T : Symbol(T, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 2, 14))
 }
 
 function Foo<T>(array: T[]): Foo<T> {
->Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
 >T : Symbol(T, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 5, 13))
 >array : Symbol(array, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 5, 16))
 >T : Symbol(T, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 5, 13))
->Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
 >T : Symbol(T, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 5, 13))
 
     return undefined;
@@ -20,7 +20,7 @@ function Foo<T>(array: T[]): Foo<T> {
 }
 
 module Foo {
->Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
+>Foo : Symbol(Foo, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 3, 1), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 0, 13), Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 7, 1))
 
     export var x = "hello";
 >x : Symbol(x, Decl(privacyCheckExportAssignmentOnExportedGenericInterface2.ts, 10, 14))
diff --git a/tests/baselines/reference/reservedWords2.symbols b/tests/baselines/reference/reservedWords2.symbols
index 8a89131fb12..562b024f313 100644
--- a/tests/baselines/reference/reservedWords2.symbols
+++ b/tests/baselines/reference/reservedWords2.symbols
@@ -1,11 +1,11 @@
 === tests/cases/compiler/reservedWords2.ts ===
 import while = require("dfdf");
 import * as  while from "foo"
-> : Symbol((Missing), Decl(reservedWords2.ts, 1, 6), Decl(reservedWords2.ts, 3, 16))
+> : Symbol((Missing), Decl(reservedWords2.ts, 3, 16), Decl(reservedWords2.ts, 1, 6))
 
 var typeof = 10;
 function throw() {}
-> : Symbol((Missing), Decl(reservedWords2.ts, 1, 6), Decl(reservedWords2.ts, 3, 16))
+> : Symbol((Missing), Decl(reservedWords2.ts, 3, 16), Decl(reservedWords2.ts, 1, 6))
 
 module void {}
 var {while, return} = { while: 1, return: 2 };
diff --git a/tests/baselines/reference/targetTypeTest1.errors.txt b/tests/baselines/reference/targetTypeTest1.errors.txt
index a0b05690a3b..32bbf9da7cd 100644
--- a/tests/baselines/reference/targetTypeTest1.errors.txt
+++ b/tests/baselines/reference/targetTypeTest1.errors.txt
@@ -1,11 +1,14 @@
 tests/cases/compiler/targetTypeTest1.ts(1,15): error TS2300: Duplicate identifier 'Point'.
+tests/cases/compiler/targetTypeTest1.ts(6,43): error TS2304: Cannot find name 'Point'.
+tests/cases/compiler/targetTypeTest1.ts(7,22): error TS2304: Cannot find name 'Point'.
 tests/cases/compiler/targetTypeTest1.ts(14,10): error TS2300: Duplicate identifier 'Point'.
 tests/cases/compiler/targetTypeTest1.ts(19,18): error TS2384: Overload signatures must all be ambient or non-ambient.
+tests/cases/compiler/targetTypeTest1.ts(26,7): error TS2339: Property 'origin' does not exist on type '(x: any, y: any) => void'.
 tests/cases/compiler/targetTypeTest1.ts(53,15): error TS2300: Duplicate identifier 'C'.
 tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifier 'C'.
 
 
-==== tests/cases/compiler/targetTypeTest1.ts (5 errors) ====
+==== tests/cases/compiler/targetTypeTest1.ts (8 errors) ====
     declare class Point
                   ~~~~~
 !!! error TS2300: Duplicate identifier 'Point'.
@@ -14,7 +17,11 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
           public x: number;
           public y: number;
           public add(dx: number, dy: number): Point;
+                                              ~~~~~
+!!! error TS2304: Cannot find name 'Point'.
           static origin: Point;
+                         ~~~~~
+!!! error TS2304: Cannot find name 'Point'.
     
     }
     
@@ -38,6 +45,8 @@ tests/cases/compiler/targetTypeTest1.ts(60,10): error TS2300: Duplicate identifi
     
     // Point.origin declared as type Point
     Point.origin = new Point(0, 0);
+          ~~~~~~
+!!! error TS2339: Property 'origin' does not exist on type '(x: any, y: any) => void'.
     
     // Point.prototype declared as type Point
     // this inferred as Point because of obj.prop assignment
diff --git a/tests/baselines/reference/targetTypeTest1.symbols b/tests/baselines/reference/targetTypeTest1.symbols
index f1f35f6d50c..0b2b97d4e0f 100644
--- a/tests/baselines/reference/targetTypeTest1.symbols
+++ b/tests/baselines/reference/targetTypeTest1.symbols
@@ -16,11 +16,9 @@ declare class Point
 >add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 5, 17))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 5, 28))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
 
       static origin: Point;
 >origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
 
 }
 
@@ -57,25 +55,21 @@ var x = EF1(1,2);
 
 // Point.origin declared as type Point
 Point.origin = new Point(0, 0);
->Point.origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
->origin : Symbol(Point.origin, Decl(targetTypeTest1.ts, 5, 48))
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
 
 // Point.prototype declared as type Point
 // this inferred as Point because of obj.prop assignment
 // dx, dy, and return type inferred using target typing
 Point.prototype.add = function(dx, dy) {
->Point.prototype.add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
->Point.prototype : Symbol(Point.prototype)
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
->prototype : Symbol(Point.prototype)
->add : Symbol(Point.add, Decl(targetTypeTest1.ts, 4, 23))
+>Point.prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 30, 31))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 30, 34))
 
     return new Point(this.x + dx, this.y + dy);
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 30, 31))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 30, 34))
 
@@ -88,9 +82,9 @@ var f : number = 5;
 // this in function add inferred to be type of object literal (i.e. Point)
 // dx, dy, and return type of add inferred using target typing
 Point.prototype = {
->Point.prototype : Symbol(Point.prototype)
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
->prototype : Symbol(Point.prototype)
+>Point.prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
 
     x: 0,
 >x : Symbol(x, Decl(targetTypeTest1.ts, 39, 19))
@@ -104,7 +98,7 @@ Point.prototype = {
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 42, 21))
 
         return new Point(this.x + dx, this.y + dy);
->Point : Symbol(Point, Decl(targetTypeTest1.ts, 0, 0))
+>Point : Symbol(Point, Decl(targetTypeTest1.ts, 8, 1))
 >dx : Symbol(dx, Decl(targetTypeTest1.ts, 42, 18))
 >dy : Symbol(dy, Decl(targetTypeTest1.ts, 42, 21))
     }
@@ -153,9 +147,9 @@ function C(a,b) {
 }
 
 C.prototype = 
->C.prototype : Symbol(C.prototype)
->C : Symbol(C, Decl(targetTypeTest1.ts, 50, 1))
->prototype : Symbol(C.prototype)
+>C.prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>C : Symbol(C, Decl(targetTypeTest1.ts, 57, 1))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
 
 	{	a:0,
 >a : Symbol(a, Decl(targetTypeTest1.ts, 65, 2))
diff --git a/tests/baselines/reference/targetTypeTest1.types b/tests/baselines/reference/targetTypeTest1.types
index d8f68f8fce1..28389f2fce5 100644
--- a/tests/baselines/reference/targetTypeTest1.types
+++ b/tests/baselines/reference/targetTypeTest1.types
@@ -13,14 +13,14 @@ declare class Point
 >y : number
 
       public add(dx: number, dy: number): Point;
->add : (dx: number, dy: number) => Point
+>add : (dx: number, dy: number) => any
 >dx : number
 >dy : number
->Point : Point
+>Point : No type information available!
 
       static origin: Point;
->origin : Point
->Point : Point
+>origin : any
+>Point : No type information available!
 
 }
 
@@ -69,12 +69,12 @@ var x = EF1(1,2);
 
 // Point.origin declared as type Point
 Point.origin = new Point(0, 0);
->Point.origin = new Point(0, 0) : Point
->Point.origin : Point
->Point : typeof Point
->origin : Point
->new Point(0, 0) : Point
->Point : typeof Point
+>Point.origin = new Point(0, 0) : any
+>Point.origin : any
+>Point : (x: any, y: any) => void
+>origin : any
+>new Point(0, 0) : any
+>Point : (x: any, y: any) => void
 >0 : 0
 >0 : 0
 
@@ -82,29 +82,29 @@ Point.origin = new Point(0, 0);
 // this inferred as Point because of obj.prop assignment
 // dx, dy, and return type inferred using target typing
 Point.prototype.add = function(dx, dy) {
->Point.prototype.add = function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: number, dy: number) => Point
->Point.prototype.add : (dx: number, dy: number) => Point
->Point.prototype : Point
->Point : typeof Point
->prototype : Point
->add : (dx: number, dy: number) => Point
->function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: number, dy: number) => Point
->dx : number
->dy : number
+>Point.prototype.add = function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: any, dy: any) => any
+>Point.prototype.add : any
+>Point.prototype : any
+>Point : (x: any, y: any) => void
+>prototype : any
+>add : any
+>function(dx, dy) {    return new Point(this.x + dx, this.y + dy);} : (dx: any, dy: any) => any
+>dx : any
+>dy : any
 
     return new Point(this.x + dx, this.y + dy);
->new Point(this.x + dx, this.y + dy) : Point
->Point : typeof Point
+>new Point(this.x + dx, this.y + dy) : any
+>Point : (x: any, y: any) => void
 >this.x + dx : any
 >this.x : any
 >this : any
 >x : any
->dx : number
+>dx : any
 >this.y + dy : any
 >this.y : any
 >this : any
 >y : any
->dy : number
+>dy : any
 
 };
 
@@ -116,11 +116,11 @@ var f : number = 5;
 // this in function add inferred to be type of object literal (i.e. Point)
 // dx, dy, and return type of add inferred using target typing
 Point.prototype = {
->Point.prototype = {    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: number, dy: number) => Point; }
->Point.prototype : Point
->Point : typeof Point
->prototype : Point
->{    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: number, dy: number) => Point; }
+>Point.prototype = {    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: any, dy: any) => any; }
+>Point.prototype : any
+>Point : (x: any, y: any) => void
+>prototype : any
+>{    x: 0,    y: 0,    add: function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    }} : { x: number; y: number; add: (dx: any, dy: any) => any; }
 
     x: 0,
 >x : number
@@ -131,24 +131,24 @@ Point.prototype = {
 >0 : 0
 
     add: function(dx, dy) {
->add : (dx: number, dy: number) => Point
->function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    } : (dx: number, dy: number) => Point
->dx : number
->dy : number
+>add : (dx: any, dy: any) => any
+>function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    } : (dx: any, dy: any) => any
+>dx : any
+>dy : any
 
         return new Point(this.x + dx, this.y + dy);
->new Point(this.x + dx, this.y + dy) : Point
->Point : typeof Point
+>new Point(this.x + dx, this.y + dy) : any
+>Point : (x: any, y: any) => void
 >this.x + dx : any
 >this.x : any
 >this : any
 >x : any
->dx : number
+>dx : any
 >this.y + dy : any
 >this.y : any
 >this : any
 >y : any
->dy : number
+>dy : any
     }
 };
 
@@ -205,13 +205,13 @@ function C(a,b) {
 }
 
 C.prototype = 
->C.prototype = 	{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: number, d: number) => any; }
->C.prototype : C
->C : typeof C
->prototype : C
+>C.prototype = 	{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: any, d: any) => any; }
+>C.prototype : any
+>C : (a: any, b: any) => void
+>prototype : any
 
 	{	a:0,
->{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: number, d: number) => any; }
+>{	a:0,		b:0, 		C1M1: function(c,d) {     				return (this.a + c) + (this.b + d);			}	} : { a: number; b: number; C1M1: (c: any, d: any) => any; }
 >a : number
 >0 : 0
 
@@ -220,10 +220,10 @@ C.prototype =
 >0 : 0
 
 		C1M1: function(c,d) {     
->C1M1 : (c: number, d: number) => any
->function(c,d) {     				return (this.a + c) + (this.b + d);			} : (c: number, d: number) => any
->c : number
->d : number
+>C1M1 : (c: any, d: any) => any
+>function(c,d) {     				return (this.a + c) + (this.b + d);			} : (c: any, d: any) => any
+>c : any
+>d : any
 
 				return (this.a + c) + (this.b + d);
 >(this.a + c) + (this.b + d) : any
@@ -232,13 +232,13 @@ C.prototype =
 >this.a : any
 >this : any
 >a : any
->c : number
+>c : any
 >(this.b + d) : any
 >this.b + d : any
 >this.b : any
 >this : any
 >b : any
->d : number
+>d : any
 			}
 	};
 
diff --git a/tests/baselines/reference/typeFromPropertyAssignment17.symbols b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
new file mode 100644
index 00000000000..ab0f9bf6c28
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment17.symbols
@@ -0,0 +1,84 @@
+=== tests/cases/conformance/salsa/use.js ===
+/// <reference path='./types.d.ts'/>
+var mini = require('./minimatch')
+>mini : Symbol(mini, Decl(use.js, 1, 3))
+>require : Symbol(require, Decl(types.d.ts, 0, 11))
+>'./minimatch' : Symbol("tests/cases/conformance/salsa/minimatch", Decl(minimatch.js, 0, 0))
+
+mini.M.defaults()
+>mini.M.defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
+>mini.M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+>mini : Symbol(mini, Decl(use.js, 1, 3))
+>M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+>defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
+
+var m = new mini.M()
+>m : Symbol(m, Decl(use.js, 3, 3))
+>mini.M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+>mini : Symbol(mini, Decl(use.js, 1, 3))
+>M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+
+m.m()
+>m.m : Symbol(M.m, Decl(minimatch.js, 11, 1))
+>m : Symbol(m, Decl(use.js, 3, 3))
+>m : Symbol(M.m, Decl(minimatch.js, 11, 1))
+
+mini.filter()
+>mini.filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
+>mini : Symbol(mini, Decl(use.js, 1, 3))
+>filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
+
+=== tests/cases/conformance/salsa/types.d.ts ===
+declare var require: any;
+>require : Symbol(require, Decl(types.d.ts, 0, 11))
+
+declare var module: any;
+>module : Symbol(module, Decl(types.d.ts, 1, 11))
+
+=== tests/cases/conformance/salsa/minimatch.js ===
+/// <reference path='./types.d.ts'/>
+module.exports = minimatch
+>module : Symbol(export=, Decl(minimatch.js, 0, 0))
+>exports : Symbol(export=, Decl(minimatch.js, 0, 0))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
+
+minimatch.M = M
+>minimatch.M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
+>M : Symbol(minimatch.M, Decl(minimatch.js, 1, 26))
+>M : Symbol(M, Decl(minimatch.js, 13, 1), Decl(minimatch.js, 8, 1))
+
+minimatch.filter = filter
+>minimatch.filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
+>filter : Symbol(minimatch.filter, Decl(minimatch.js, 2, 15))
+>filter : Symbol(filter, Decl(minimatch.js, 3, 25))
+
+function filter() {
+>filter : Symbol(filter, Decl(minimatch.js, 3, 25))
+
+    return minimatch()
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
+}
+function minimatch() {
+>minimatch : Symbol(minimatch, Decl(minimatch.js, 6, 1))
+}
+M.defaults = function (def) {
+>M.defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
+>M : Symbol(M, Decl(minimatch.js, 13, 1), Decl(minimatch.js, 8, 1))
+>defaults : Symbol(M.defaults, Decl(minimatch.js, 8, 1))
+>def : Symbol(def, Decl(minimatch.js, 9, 23))
+
+    return def
+>def : Symbol(def, Decl(minimatch.js, 9, 23))
+}
+M.prototype.m = function () {
+>M.prototype : Symbol(M.m, Decl(minimatch.js, 11, 1))
+>M : Symbol(M, Decl(minimatch.js, 13, 1), Decl(minimatch.js, 8, 1))
+>prototype : Symbol(Function.prototype, Decl(lib.d.ts, --, --))
+>m : Symbol(M.m, Decl(minimatch.js, 11, 1))
+}
+function M() {
+>M : Symbol(M, Decl(minimatch.js, 13, 1), Decl(minimatch.js, 8, 1))
+}
+
diff --git a/tests/baselines/reference/typeFromPropertyAssignment17.types b/tests/baselines/reference/typeFromPropertyAssignment17.types
new file mode 100644
index 00000000000..5c339d2093b
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment17.types
@@ -0,0 +1,99 @@
+=== tests/cases/conformance/salsa/use.js ===
+/// <reference path='./types.d.ts'/>
+var mini = require('./minimatch')
+>mini : { (): void; M: typeof M; filter: () => void; }
+>require('./minimatch') : { (): void; M: typeof M; filter: () => void; }
+>require : any
+>'./minimatch' : "./minimatch"
+
+mini.M.defaults()
+>mini.M.defaults() : any
+>mini.M.defaults : (def: any) => any
+>mini.M : typeof M
+>mini : { (): void; M: typeof M; filter: () => void; }
+>M : typeof M
+>defaults : (def: any) => any
+
+var m = new mini.M()
+>m : typeof M
+>new mini.M() : typeof M
+>mini.M : typeof M
+>mini : { (): void; M: typeof M; filter: () => void; }
+>M : typeof M
+
+m.m()
+>m.m() : void
+>m.m : () => void
+>m : typeof M
+>m : () => void
+
+mini.filter()
+>mini.filter() : void
+>mini.filter : () => void
+>mini : { (): void; M: typeof M; filter: () => void; }
+>filter : () => void
+
+=== tests/cases/conformance/salsa/types.d.ts ===
+declare var require: any;
+>require : any
+
+declare var module: any;
+>module : any
+
+=== tests/cases/conformance/salsa/minimatch.js ===
+/// <reference path='./types.d.ts'/>
+module.exports = minimatch
+>module.exports = minimatch : { (): void; M: typeof M; filter: () => void; }
+>module.exports : any
+>module : any
+>exports : any
+>minimatch : { (): void; M: typeof M; filter: () => void; }
+
+minimatch.M = M
+>minimatch.M = M : typeof M
+>minimatch.M : typeof M
+>minimatch : { (): void; M: typeof M; filter: () => void; }
+>M : typeof M
+>M : typeof M
+
+minimatch.filter = filter
+>minimatch.filter = filter : () => void
+>minimatch.filter : () => void
+>minimatch : { (): void; M: typeof M; filter: () => void; }
+>filter : () => void
+>filter : () => void
+
+function filter() {
+>filter : () => void
+
+    return minimatch()
+>minimatch() : void
+>minimatch : { (): void; M: typeof M; filter: () => void; }
+}
+function minimatch() {
+>minimatch : { (): void; M: typeof M; filter: () => void; }
+}
+M.defaults = function (def) {
+>M.defaults = function (def) {    return def} : (def: any) => any
+>M.defaults : (def: any) => any
+>M : typeof M
+>defaults : (def: any) => any
+>function (def) {    return def} : (def: any) => any
+>def : any
+
+    return def
+>def : any
+}
+M.prototype.m = function () {
+>M.prototype.m = function () {} : () => void
+>M.prototype.m : any
+>M.prototype : any
+>M : typeof M
+>prototype : any
+>m : any
+>function () {} : () => void
+}
+function M() {
+>M : typeof M
+}
+
diff --git a/tests/baselines/reference/typeFromPropertyAssignment18.symbols b/tests/baselines/reference/typeFromPropertyAssignment18.symbols
new file mode 100644
index 00000000000..b4342c29394
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment18.symbols
@@ -0,0 +1,30 @@
+=== tests/cases/conformance/salsa/a.js ===
+var GLOBSTAR = m.GLOBSTAR = {}
+>GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3))
+>m.GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+>m : Symbol(m, Decl(a.js, 0, 30))
+>GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+
+function m() {
+>m : Symbol(m, Decl(a.js, 0, 30))
+}
+GLOBSTAR.p = 1
+>GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3))
+
+m.GLOBSTAR.q = 2
+>m.GLOBSTAR.q : Symbol(q, Decl(a.js, 3, 14))
+>m.GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+>m : Symbol(m, Decl(a.js, 0, 30))
+>GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+>q : Symbol(q, Decl(a.js, 3, 14))
+
+GLOBSTAR.q
+>GLOBSTAR.q : Symbol(q, Decl(a.js, 3, 14))
+>GLOBSTAR : Symbol(GLOBSTAR, Decl(a.js, 0, 3))
+>q : Symbol(q, Decl(a.js, 3, 14))
+
+m.GLOBSTAR.p
+>m.GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+>m : Symbol(m, Decl(a.js, 0, 30))
+>GLOBSTAR : Symbol(m.GLOBSTAR, Decl(a.js, 0, 14))
+
diff --git a/tests/baselines/reference/typeFromPropertyAssignment18.types b/tests/baselines/reference/typeFromPropertyAssignment18.types
new file mode 100644
index 00000000000..9f594379d0b
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment18.types
@@ -0,0 +1,40 @@
+=== tests/cases/conformance/salsa/a.js ===
+var GLOBSTAR = m.GLOBSTAR = {}
+>GLOBSTAR : { [x: string]: any; q: number; }
+>m.GLOBSTAR = {} : { [x: string]: any; q: number; }
+>m.GLOBSTAR : { [x: string]: any; q: number; }
+>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; }
+>GLOBSTAR : { [x: string]: any; q: number; }
+>{} : { [x: string]: any; q: number; }
+
+function m() {
+>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; }
+}
+GLOBSTAR.p = 1
+>GLOBSTAR.p = 1 : 1
+>GLOBSTAR.p : any
+>GLOBSTAR : { [x: string]: any; q: number; }
+>p : any
+>1 : 1
+
+m.GLOBSTAR.q = 2
+>m.GLOBSTAR.q = 2 : 2
+>m.GLOBSTAR.q : number
+>m.GLOBSTAR : { [x: string]: any; q: number; }
+>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; }
+>GLOBSTAR : { [x: string]: any; q: number; }
+>q : number
+>2 : 2
+
+GLOBSTAR.q
+>GLOBSTAR.q : number
+>GLOBSTAR : { [x: string]: any; q: number; }
+>q : number
+
+m.GLOBSTAR.p
+>m.GLOBSTAR.p : any
+>m.GLOBSTAR : { [x: string]: any; q: number; }
+>m : { (): void; GLOBSTAR: { [x: string]: any; q: number; }; }
+>GLOBSTAR : { [x: string]: any; q: number; }
+>p : any
+
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt b/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt
new file mode 100644
index 00000000000..d43728d360b
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.errors.txt
@@ -0,0 +1,20 @@
+tests/cases/conformance/salsa/semver.js(2,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/semver"' because it is not a variable.
+
+
+==== tests/cases/conformance/salsa/index.js (0 errors) ====
+    /// <reference path='./types.d.ts'/>
+    const C = require("./semver")
+    var two = C.f(1)
+    
+==== tests/cases/conformance/salsa/types.d.ts (0 errors) ====
+    declare var require: any;
+    declare var module: any;
+==== tests/cases/conformance/salsa/semver.js (1 errors) ====
+    /// <reference path='./types.d.ts'/>
+    exports = module.exports = C
+    ~~~~~~~
+!!! error TS2539: Cannot assign to '"tests/cases/conformance/salsa/semver"' because it is not a variable.
+    C.f = n => n + 1
+    function C() {
+        this.p = 1
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.symbols b/tests/baselines/reference/typeFromPropertyAssignment19.symbols
new file mode 100644
index 00000000000..59bab00cc3c
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.symbols
@@ -0,0 +1,41 @@
+=== tests/cases/conformance/salsa/index.js ===
+/// <reference path='./types.d.ts'/>
+const C = require("./semver")
+>C : Symbol(C, Decl(index.js, 1, 5))
+>require : Symbol(require, Decl(types.d.ts, 0, 11))
+>"./semver" : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+
+var two = C.f(1)
+>two : Symbol(two, Decl(index.js, 2, 3))
+>C.f : Symbol(C.f, Decl(semver.js, 1, 28))
+>C : Symbol(C, Decl(index.js, 1, 5))
+>f : Symbol(C.f, Decl(semver.js, 1, 28))
+
+=== tests/cases/conformance/salsa/types.d.ts ===
+declare var require: any;
+>require : Symbol(require, Decl(types.d.ts, 0, 11))
+
+declare var module: any;
+>module : Symbol(module, Decl(types.d.ts, 1, 11))
+
+=== tests/cases/conformance/salsa/semver.js ===
+/// <reference path='./types.d.ts'/>
+exports = module.exports = C
+>exports : Symbol("tests/cases/conformance/salsa/semver", Decl(semver.js, 0, 0))
+>module : Symbol(export=, Decl(semver.js, 1, 9))
+>exports : Symbol(export=, Decl(semver.js, 1, 9))
+>C : Symbol(C, Decl(semver.js, 2, 16))
+
+C.f = n => n + 1
+>C.f : Symbol(C.f, Decl(semver.js, 1, 28))
+>C : Symbol(C, Decl(semver.js, 2, 16))
+>f : Symbol(C.f, Decl(semver.js, 1, 28))
+>n : Symbol(n, Decl(semver.js, 2, 5))
+>n : Symbol(n, Decl(semver.js, 2, 5))
+
+function C() {
+>C : Symbol(C, Decl(semver.js, 2, 16))
+
+    this.p = 1
+>p : Symbol(C.p, Decl(semver.js, 3, 14))
+}
diff --git a/tests/baselines/reference/typeFromPropertyAssignment19.types b/tests/baselines/reference/typeFromPropertyAssignment19.types
new file mode 100644
index 00000000000..b98e32e0f57
--- /dev/null
+++ b/tests/baselines/reference/typeFromPropertyAssignment19.types
@@ -0,0 +1,55 @@
+=== tests/cases/conformance/salsa/index.js ===
+/// <reference path='./types.d.ts'/>
+const C = require("./semver")
+>C : { (): void; f: (n: any) => any; }
+>require("./semver") : { (): void; f: (n: any) => any; }
+>require : any
+>"./semver" : "./semver"
+
+var two = C.f(1)
+>two : any
+>C.f(1) : any
+>C.f : (n: any) => any
+>C : { (): void; f: (n: any) => any; }
+>f : (n: any) => any
+>1 : 1
+
+=== tests/cases/conformance/salsa/types.d.ts ===
+declare var require: any;
+>require : any
+
+declare var module: any;
+>module : any
+
+=== tests/cases/conformance/salsa/semver.js ===
+/// <reference path='./types.d.ts'/>
+exports = module.exports = C
+>exports = module.exports = C : { (): void; f: (n: any) => any; }
+>exports : any
+>module.exports = C : { (): void; f: (n: any) => any; }
+>module.exports : any
+>module : any
+>exports : any
+>C : { (): void; f: (n: any) => any; }
+
+C.f = n => n + 1
+>C.f = n => n + 1 : (n: any) => any
+>C.f : (n: any) => any
+>C : { (): void; f: (n: any) => any; }
+>f : (n: any) => any
+>n => n + 1 : (n: any) => any
+>n : any
+>n + 1 : any
+>n : any
+>1 : 1
+
+function C() {
+>C : { (): void; f: (n: any) => any; }
+
+    this.p = 1
+>this.p = 1 : 1
+>this.p : any
+>this : any
+>p : any
+>1 : 1
+}
diff --git a/tests/cases/compiler/contextualTyping.ts b/tests/cases/compiler/contextualTyping.ts
index 1ff85e46cce..73a75d01466 100644
--- a/tests/cases/compiler/contextualTyping.ts
+++ b/tests/cases/compiler/contextualTyping.ts
@@ -205,13 +205,6 @@ declare class Point
 
 }
 
-function Point(x, y) {
-    this.x = x;
-    this.y = y;
-
-    return this;
-}
-
 Point.origin = new Point(0, 0);
 
 Point.prototype.add = function(dx, dy) {
diff --git a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments2.ts b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments2.ts
new file mode 100644
index 00000000000..ba7ea55b2a3
--- /dev/null
+++ b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments2.ts
@@ -0,0 +1,10 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @filename: a.js
+OOOrder.prototype.m = function () {
+    this.p = 1
+}
+function OOOrder() {
+    this.x = 1
+}
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts
new file mode 100644
index 00000000000..14358c8a725
--- /dev/null
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment17.ts
@@ -0,0 +1,31 @@
+// @noEmit: true
+// @allowJs: true
+// @checkJs: true
+// @Filename: types.d.ts
+declare var require: any;
+declare var module: any;
+// @Filename: minimatch.js
+/// <reference path='./types.d.ts'/>
+module.exports = minimatch
+minimatch.M = M
+minimatch.filter = filter
+function filter() {
+    return minimatch()
+}
+function minimatch() {
+}
+M.defaults = function (def) {
+    return def
+}
+M.prototype.m = function () {
+}
+function M() {
+}
+
+// @Filename: use.js
+/// <reference path='./types.d.ts'/>
+var mini = require('./minimatch')
+mini.M.defaults()
+var m = new mini.M()
+m.m()
+mini.filter()
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts
new file mode 100644
index 00000000000..3940cd7a13e
--- /dev/null
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment18.ts
@@ -0,0 +1,12 @@
+// @noEmit: true
+// @allowJs: true
+// @checkJs: true
+// @Filename: a.js
+var GLOBSTAR = m.GLOBSTAR = {}
+function m() {
+}
+GLOBSTAR.p = 1
+m.GLOBSTAR.q = 2
+
+GLOBSTAR.q
+m.GLOBSTAR.p
diff --git a/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts b/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts
new file mode 100644
index 00000000000..985dd5714ef
--- /dev/null
+++ b/tests/cases/conformance/salsa/typeFromPropertyAssignment19.ts
@@ -0,0 +1,17 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: types.d.ts
+declare var require: any;
+declare var module: any;
+// @Filename: semver.js
+/// <reference path='./types.d.ts'/>
+exports = module.exports = C
+C.f = n => n + 1
+function C() {
+    this.p = 1
+}
+// @filename: index.js
+/// <reference path='./types.d.ts'/>
+const C = require("./semver")
+var two = C.f(1)
diff --git a/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts b/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
index 9e7efc52761..8ffce0bbb28 100644
--- a/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
+++ b/tests/cases/fourslash/quickInfoImportedTypesWithMergedMeanings.ts
@@ -14,15 +14,15 @@
 //// Alias/*2*/;
 
 verify.quickInfoAt("1", [
+    "(alias) function Original(): void",
     "(alias) type Original<T> = () => T",
     "(alias) namespace Original",
-    "(alias) function Original(): void",
     "import Original",
 ].join("\n"), "some docs ");
 
 verify.quickInfoAt("2", [
+    "(alias) function Alias(): void",
     "(alias) type Alias<T> = () => T",
     "(alias) namespace Alias",
-    "(alias) function Alias(): void",
     "import Alias",
 ].join("\n"), "some docs ");
diff --git a/tests/cases/fourslash/referencesForMergedDeclarations2.ts b/tests/cases/fourslash/referencesForMergedDeclarations2.ts
index ba61d4c9061..1a4bc59c9b2 100644
--- a/tests/cases/fourslash/referencesForMergedDeclarations2.ts
+++ b/tests/cases/fourslash/referencesForMergedDeclarations2.ts
@@ -12,7 +12,7 @@
 ////[|alias|].call(this); // value
 
 verify.singleReferenceGroup([
-    "(alias) namespace alias",
     "(alias) function alias(): void",
+    "(alias) namespace alias",
     "import alias = ATest"
 ].join("\n"));