From 7d434b7c78062fb9ec2949736f1dd5f8b454789d Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Fri, 26 Jul 2024 18:18:30 -0700
Subject: [PATCH 01/11] Refactored node builder flags and tests

---
 src/compiler/checker.ts                       |  18 +-
 src/compiler/types.ts                         |  85 +-
 src/harness/typeWriter.ts                     |   4 +-
 src/services/codefixes/helpers.ts             |   2 +-
 src/services/inlayHints.ts                    |   5 +-
 src/services/signatureHelp.ts                 |   3 +-
 src/services/symbolDisplay.ts                 |   3 +-
 .../baselines/reference/ArrowFunction1.types  |   4 +-
 ...duleMemberThatUsesClassTypeParameter.types |   2 +-
 tests/baselines/reference/api/typescript.d.ts |  71 +-
 tests/baselines/reference/arguments.types     |  12 +-
 .../arrayReferenceWithoutTypeArgs.types       |   4 +-
 .../asyncAwaitIsolatedModules_es2017.types    |  24 +-
 .../asyncAwaitIsolatedModules_es5.types       |  24 +-
 .../asyncAwaitIsolatedModules_es6.types       |  24 +-
 .../badExternalModuleReference.types          |   2 +-
 .../reference/bluebirdStaticThis.types        |   2 +-
 .../reference/circularBaseTypes.types         |   4 +-
 .../reference/complicatedPrivacy.types        |   4 +-
 ...structorWithIncompleteTypeAnnotation.types |   8 +-
 ...arationEmitComputedPropertyNameEnum2.types |   8 +-
 .../errorsInGenericTypeReference.types        |  22 +-
 ...orMetadataUnresolvedTypeObjectInEmit.types |   2 +-
 ...rtSpecifierAndLocalMemberDeclaration.types |   2 +-
 ...pecifierReferencingOuterDeclaration3.types |   2 +-
 ...pecifierReferencingOuterDeclaration4.types |   2 +-
 tests/baselines/reference/extendArray.types   |   2 +-
 .../functionTypesLackingReturnTypes.types     |   2 +-
 ...nctionVariableInReturnTypeAnnotation.types |   4 +-
 ...icCallWithGenericSignatureArguments2.types |   2 +-
 ...icClassWithStaticsUsingTypeArguments.types |  12 +-
 .../genericLambaArgWithoutTypeArguments.types |   4 +-
 ...cRecursiveImplicitConstructorErrors3.types |  28 +-
 ...icTypeReferenceWithoutTypeArgument.d.types |  12 +-
 ...ericTypeReferenceWithoutTypeArgument.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument2.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument3.types |  12 +-
 .../genericsWithoutTypeParameters1.types      |  16 +-
 .../reference/importTypeGeneric.types         |   8 +-
 .../reference/importedModuleAddToGlobal.types |   2 +-
 .../reference/intrinsicKeyword.types          |   2 +-
 .../jsdocFunctionTypeFalsePositive.types      |   2 +-
 .../reference/jsdocOuterTypeParameters1.types |   6 +-
 .../jsdocParameterParsingInfiniteLoop.types   |   2 +-
 .../jsdocResolveNameFailureInTypedef.types    |   4 +-
 .../baselines/reference/lambdaArgCrash.types  |   4 +-
 tests/baselines/reference/localTypes4.types   |   2 +-
 .../reference/missingTypeArguments1.types     |   8 +-
 .../reference/missingTypeArguments2.types     |  12 +-
 ...moduleAugmentationImportsAndExports2.types |   2 +-
 ...moduleAugmentationImportsAndExports3.types |   2 +-
 .../reference/moduleExportAssignment7.types   |  12 +-
 .../reference/moduleInTypePosition1.types     |   4 +-
 ...ropertyAccessAndArrowFunctionIndent1.types |   4 +-
 .../noTypeArgumentOnReturnType1.types         |   4 +-
 ...jectTypesIdentityWithCallSignatures3.types |  12 +-
 tests/baselines/reference/parser553699.types  |   2 +-
 .../parserArrowFunctionExpression10.types     |   8 +-
 .../parserArrowFunctionExpression17.types     |   4 +-
 ...rrantEqualsGreaterThanAfterFunction2.types |   2 +-
 .../parserErrorRecovery_ParameterList6.types  |   2 +-
 .../parserGenericsInTypeContexts1.types       |   4 +-
 .../parserGenericsInTypeContexts2.types       |   4 +-
 .../parserMissingLambdaOpenBrace1.types       |   2 +-
 .../reference/parserObjectType5.types         |   2 +-
 .../reference/parserObjectType6.types         |   2 +-
 .../reference/parserRealSource10.types        | 220 ++--
 .../reference/parserRealSource11.types        | 240 ++---
 .../reference/parserRealSource12.types        | 978 +++++++++---------
 .../reference/parserRealSource13.types        | 242 ++---
 .../reference/parserRealSource14.types        |  66 +-
 .../reference/parserRealSource5.types         |   4 +-
 .../reference/parserRealSource6.types         |  66 +-
 .../reference/parserRealSource7.types         |  70 +-
 .../reference/parserRealSource8.types         |  42 +-
 .../reference/parserRealSource9.types         |  72 +-
 .../parserUnterminatedGeneric1.types          |   2 +-
 .../parserUnterminatedGeneric2.types          |   2 +-
 .../reference/parserX_ArrowFunction1.types    |   4 +-
 tests/baselines/reference/parserharness.types | 180 ++--
 .../baselines/reference/parserindenter.types  | 138 +--
 .../reference/privacyImportParseErrors.types  |  16 +-
 ...tyAssignmentMergeWithInterfaceMethod.types |   8 +-
 .../recursiveClassReferenceTest.types         |   2 +-
 .../reference/recursiveMappedTypes.types      |   4 +-
 .../reference/recursiveTypeComparison2.types  |   2 +-
 .../reference/recursiveTypeRelations.types    |   2 +-
 .../reference/returnTypeTypeArguments.types   |  88 +-
 .../baselines/reference/sourceMapSample.types |   2 +-
 .../reference/staticInstanceResolution5.types |  10 +-
 ...staticMembersUsingClassTypeParameter.types |   6 +-
 ...ethodsReferencingClassTypeParameters.types |   2 +-
 .../reference/strictModeReservedWord.types    |   6 +-
 .../baselines/reference/thisTypeErrors.types  |  80 +-
 .../reference/typeGuardFunctionErrors.types   |   8 +-
 ...ameterUsedAsTypeParameterConstraint4.types |  14 +-
 .../typeParametersInStaticAccessors.types     |   6 +-
 .../typeParametersInStaticMethods.types       |   4 +-
 .../reference/typedefTagTypeResolution.types  |   4 +-
 .../reference/typeofInObjectLiteralType.types |   4 +-
 .../reference/undeclaredModuleError.types     |   4 +-
 .../reference/undefinedTypeArgument2.types    |   2 +-
 .../unknownSymbolInGenericReturnType.types    |   4 +-
 .../baselines/reference/unknownSymbols1.types |   2 +-
 ...ionsClassMemberImportTypeNodeParameter2.ts |   2 +-
 ...ionsClassMemberImportTypeNodeParameter4.ts |   2 +-
 106 files changed, 1625 insertions(+), 1610 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f18a0b2a32a23..5c0b575ce88af 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1119,6 +1119,7 @@ import {
     WideningContext,
     WithStatement,
     YieldExpression,
+    NodeBuilderFlagsIgnoreErrors,
 } from "./_namespaces/ts.js";
 import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers.js";
 import * as performance from "./_namespaces/ts.performance.js";
@@ -5910,7 +5911,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags: SymbolFormatFlags = SymbolFormatFlags.AllowAnyNodeKind, writer?: EmitTextWriter): string {
-        let nodeFlags = NodeBuilderFlags.IgnoreErrors;
+        let nodeFlags = NodeBuilderFlagsIgnoreErrors;
         if (flags & SymbolFormatFlags.UseOnlyExternalAliasing) {
             nodeFlags |= NodeBuilderFlags.UseOnlyExternalAliasing;
         }
@@ -5952,7 +5953,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             else {
                 sigOutput = kind === SignatureKind.Construct ? SyntaxKind.ConstructSignature : SyntaxKind.CallSignature;
             }
-            const sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName);
+            const sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName);
             const printer = createPrinterWithRemoveCommentsOmitTrailingSemicolon();
             const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(EmitHint.Unspecified, sig!, /*sourceFile*/ sourceFile, getTrailingSemicolonDeferringWriter(writer)); // TODO: GH#18217
@@ -5961,8 +5962,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
-        const noTruncation = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation;
-        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : 0));
+        const noTruncation = BigInt(compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation);
+        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None));
         if (typeNode === undefined) return Debug.fail("should always get typenode");
         // The unresolved type gets a synthesized comment on `any` to hint to users that it's not a plain `any`.
         // Otherwise, we always strip comments out.
@@ -5997,7 +5998,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function toNodeBuilderFlags(flags = TypeFormatFlags.None): NodeBuilderFlags {
-        return flags & TypeFormatFlags.NodeBuilderFlagsMask;
+        return BigInt(flags & TypeFormatFlags.NodeBuilderFlagsMask);
     }
 
     function isClassInstanceSide(type: Type) {
@@ -6156,7 +6157,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
         function withContext<T>(enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker: SymbolTracker | undefined, cb: (context: NodeBuilderContext) => T): T | undefined {
             const moduleResolverHost = tracker?.trackSymbol ? tracker.moduleResolverHost :
-                flags! & NodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
+                (flags || NodeBuilderFlags.None) & NodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
                 undefined;
             const context: NodeBuilderContext = {
                 enclosingDeclaration,
@@ -10676,7 +10677,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return writer ? typePredicateToStringWorker(writer).getText() : usingSingleLineStringWriter(typePredicateToStringWorker);
 
         function typePredicateToStringWorker(writer: EmitTextWriter) {
-            const nodeBuilderFlags = toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName;
+            const nodeBuilderFlags = toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName;
             const predicate = nodeBuilder.typePredicateToTypePredicateNode(typePredicate, enclosingDeclaration, nodeBuilderFlags)!; // TODO: GH#18217
             const printer = createPrinterWithRemoveComments();
             const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
@@ -27382,9 +27383,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function isFunctionObjectType(type: ObjectType): boolean {
-        if (getObjectFlags(type) & ObjectFlags.EvolvingArray) {
-            return false;
-        }
         // We do a quick check for a "bind" property before performing the more expensive subtype
         // check. This gives us a quicker out in the common case where an object type is not a function.
         const resolved = resolveStructuredTypeMembers(type);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 564fa64e1294c..2a3fc42b0976a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5427,52 +5427,61 @@ export const enum ContextFlags {
     SkipBindingPatterns = 1 << 3, // Ignore contextual types applied by binding patterns
 }
 
+export type NodeBuilderFlags = bigint;
+
 // NOTE: If modifying this enum, must modify `TypeFormatFlags` too!
 // dprint-ignore
-export const enum NodeBuilderFlags {
-    None                                    = 0,
+export const NodeBuilderFlags = {
+    None                                    : 0n,
     // Options
-    NoTruncation                            = 1 << 0,   // Don't truncate result
-    WriteArrayAsGenericType                 = 1 << 1,   // Write Array<T> instead T[]
-    GenerateNamesForShadowedTypeParams      = 1 << 2,   // When a type parameter T is shadowing another T, generate a name for it so it can still be referenced
-    UseStructuralFallback                   = 1 << 3,   // When an alias cannot be named by its symbol, rather than report an error, fallback to a structural printout if possible
-    ForbidIndexedAccessSymbolReferences     = 1 << 4,   // Forbid references like `I["a"]["b"]` - print `typeof I.a<x>.b<y>` instead
-    WriteTypeArgumentsOfSignature           = 1 << 5,   // Write the type arguments instead of type parameters of the signature
-    UseFullyQualifiedType                   = 1 << 6,   // Write out the fully qualified type name (eg. Module.Type, instead of Type)
-    UseOnlyExternalAliasing                 = 1 << 7,   // Only use external aliases for a symbol
-    SuppressAnyReturnType                   = 1 << 8,   // If the return type is any-like and can be elided, don't offer a return type.
-    WriteTypeParametersInQualifiedName      = 1 << 9,
-    MultilineObjectLiterals                 = 1 << 10,  // Always write object literals across multiple lines
-    WriteClassExpressionAsTypeLiteral       = 1 << 11,  // Write class {} as { new(): {} } - used for mixin declaration emit
-    UseTypeOfFunction                       = 1 << 12,  // Build using typeof instead of function type literal
-    OmitParameterModifiers                  = 1 << 13,  // Omit modifiers on parameters
-    UseAliasDefinedOutsideCurrentScope      = 1 << 14,  // Allow non-visible aliases
-    UseSingleQuotesForStringLiteralType     = 1 << 28,  // Use single quotes for string literal type
-    NoTypeReduction                         = 1 << 29,  // Don't call getReducedType
-    OmitThisParameter                       = 1 << 25,
+    NoTruncation                            : 1n << 0n,   // Don't truncate result
+    WriteArrayAsGenericType                 : 1n << 1n,   // Write Array<T> instead T[]
+    GenerateNamesForShadowedTypeParams      : 1n << 2n,   // When a type parameter T is shadowing another T, generate a name for it so it can still be referenced
+    UseStructuralFallback                   : 1n << 3n,   // When an alias cannot be named by its symbol, rather than report an error, fallback to a structural printout if possible
+    ForbidIndexedAccessSymbolReferences     : 1n << 4n,   // Forbid references like `I["a"]["b"]` - print `typeof I.a<x>.b<y>` instead
+    WriteTypeArgumentsOfSignature           : 1n << 5n,   // Write the type arguments instead of type parameters of the signature
+    UseFullyQualifiedType                   : 1n << 6n,   // Write out the fully qualified type name (eg. Module.Type, instead of Type)
+    UseOnlyExternalAliasing                 : 1n << 7n,   // Only use external aliases for a symbol
+    SuppressAnyReturnType                   : 1n << 8n,   // If the return type is any-like and can be elided, don't offer a return type.
+    WriteTypeParametersInQualifiedName      : 1n << 9n,
+    MultilineObjectLiterals                 : 1n << 10n,  // Always write object literals across multiple lines
+    WriteClassExpressionAsTypeLiteral       : 1n << 11n,  // Write class {} as { new(): {} } - used for mixin declaration emit
+    UseTypeOfFunction                       : 1n << 12n,  // Build using typeof instead of function type literal
+    OmitParameterModifiers                  : 1n << 13n,  // Omit modifiers on parameters
+    UseAliasDefinedOutsideCurrentScope      : 1n << 14n,  // Allow non-visible aliases
+    UseSingleQuotesForStringLiteralType     : 1n << 28n,  // Use single quotes for string literal type
+    NoTypeReduction                         : 1n << 29n,  // Don't call getReducedType
+    OmitThisParameter                       : 1n << 25n,
 
     // Error handling
-    AllowThisInObjectLiteral                = 1 << 15,
-    AllowQualifiedNameInPlaceOfIdentifier   = 1 << 16,
-    AllowAnonymousIdentifier                = 1 << 17,
-    AllowEmptyUnionOrIntersection           = 1 << 18,
-    AllowEmptyTuple                         = 1 << 19,
-    AllowUniqueESSymbolType                 = 1 << 20,
-    AllowEmptyIndexInfoType                 = 1 << 21,
-    /** @internal */ WriteComputedProps      = 1 << 30, // { [E.A]: 1 }
-    /** @internal */ NoSyntacticPrinter     = 1 << 31,
+    AllowThisInObjectLiteral                : 1n << 15n,
+    AllowQualifiedNameInPlaceOfIdentifier   : 1n << 16n,
+    AllowAnonymousIdentifier                : 1n << 17n,
+    AllowEmptyUnionOrIntersection           : 1n << 18n,
+    AllowEmptyTuple                         : 1n << 19n,
+    AllowUniqueESSymbolType                 : 1n << 20n,
+    AllowEmptyIndexInfoType                 : 1n << 21n,
+    /** @internal */ WriteComputedProps      : 1n << 30n, // { [E.A]: 1 }
+    /** @internal */ NoSyntacticPrinter     : 1n << 31n,
     // Errors (cont.)
-    AllowNodeModulesRelativePaths           = 1 << 26,
-    /** @internal */ DoNotIncludeSymbolChain = 1 << 27,    // Skip looking up and printing an accessible symbol chain
-    /** @internal */ AllowUnresolvedNames = 1 << 32,
-
-    IgnoreErrors = AllowThisInObjectLiteral | AllowQualifiedNameInPlaceOfIdentifier | AllowAnonymousIdentifier | AllowEmptyUnionOrIntersection | AllowEmptyTuple | AllowEmptyIndexInfoType | AllowNodeModulesRelativePaths,
+    AllowNodeModulesRelativePaths           : 1n << 26n,
+    /** @internal */ DoNotIncludeSymbolChain : 1n << 27n,    // Skip looking up and printing an accessible symbol chain
+    /** @internal */ AllowUnresolvedNames : 1n << 32n,
 
     // State
-    InObjectTypeLiteral                     = 1 << 22,
-    InTypeAlias                             = 1 << 23,    // Writing type in type alias declaration
-    InInitialEntityName                     = 1 << 24,    // Set when writing the LHS of an entity name or entity name expression
-}
+    InObjectTypeLiteral                     : 1n << 22n,
+    InTypeAlias                             : 1n << 23n,    // Writing type in type alias declaration
+    InInitialEntityName                     : 1n << 24n,    // Set when writing the LHS of an entity name or entity name expression
+}
+
+export const NodeBuilderFlagsIgnoreErrors = 
+    NodeBuilderFlags.AllowThisInObjectLiteral 
+    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier 
+    | NodeBuilderFlags.AllowAnonymousIdentifier 
+    | NodeBuilderFlags.AllowEmptyUnionOrIntersection 
+    | NodeBuilderFlags.AllowEmptyTuple 
+    | NodeBuilderFlags.AllowEmptyIndexInfoType 
+    | NodeBuilderFlags.AllowNodeModulesRelativePaths;
 
 // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment
 // dprint-ignore
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index e09f8bd56a272..b413432ddd4ee 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -279,11 +279,11 @@ export class TypeWriterWalker {
             }
             else {
                 const typeFormatFlags = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType | ts.TypeFormatFlags.GenerateNamesForShadowedTypeParams;
-                let typeNode = this.checker.typeToTypeNode(type, node.parent, (typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors)!;
+                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask)) | ts.NodeBuilderFlagsIgnoreErrors)!;
                 if (ts.isIdentifier(node) && ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node && ts.isIdentifier(typeNode) && ts.idText(typeNode) === ts.idText(node)) {
                     // for a complex type alias `type T = ...`, showing "T : T" isn't very helpful for type tests. When the type produced is the same as
                     // the name of the type alias, recreate the type string without reusing the alias name
-                    typeNode = this.checker.typeToTypeNode(type, node.parent, ((typeFormatFlags | ts.TypeFormatFlags.InTypeAlias) & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors)!;
+                    typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags | ts.TypeFormatFlags.InTypeAlias) & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlagsIgnoreErrors)!;
                 }
 
                 const { printer, writer, underliner, reset } = createSyntheticNodeUnderliningPrinter();
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 0524080520582..3185d2697ed61 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -221,7 +221,7 @@ export function addNewNodeForMemberSymbol(
         case SyntaxKind.PropertySignature:
         case SyntaxKind.PropertyDeclaration:
             let flags = NodeBuilderFlags.NoTruncation;
-            flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : 0;
+            flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : NodeBuilderFlags.None;
             let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (importAdder) {
                 const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
diff --git a/src/services/inlayHints.ts b/src/services/inlayHints.ts
index ce779052a053a..bd5d7dde8d1d9 100644
--- a/src/services/inlayHints.ts
+++ b/src/services/inlayHints.ts
@@ -102,6 +102,7 @@ import {
     Node,
     NodeArray,
     NodeBuilderFlags,
+    NodeBuilderFlagsIgnoreErrors,
     ParameterDeclaration,
     PrefixUnaryExpression,
     PropertyDeclaration,
@@ -464,7 +465,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
     }
 
     function printTypeInSingleLine(type: Type) {
-        const flags = NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+        const flags = NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
         const printer = createPrinterWithRemoveComments();
 
         return usingSingleLineStringWriter(writer => {
@@ -479,7 +480,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
             return printTypeInSingleLine(type);
         }
 
-        const flags = NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+        const flags = NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
         const typeNode = checker.typeToTypeNode(type, /*enclosingDeclaration*/ undefined, flags);
         Debug.assertIsDefined(typeNode, "should always get typenode");
 
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 70e9174e64a60..370190c7a462b 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -64,6 +64,7 @@ import {
     mapToDisplayParts,
     Node,
     NodeBuilderFlags,
+    NodeBuilderFlagsIgnoreErrors,
     ParameterDeclaration,
     ParenthesizedExpression,
     Printer,
@@ -643,7 +644,7 @@ function getEnclosingDeclarationFromInvocation(invocation: Invocation): Node {
     return invocation.kind === InvocationKind.Call ? invocation.node : invocation.kind === InvocationKind.TypeArgs ? invocation.called : invocation.node;
 }
 
-const signatureHelpNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+const signatureHelpNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
 function createSignatureHelpItems(
     candidates: readonly Signature[],
     resolvedSignature: Signature,
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index 5ba8170b17b32..ffa6fab6afc4b 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -75,6 +75,7 @@ import {
     NewExpression,
     Node,
     NodeBuilderFlags,
+    NodeBuilderFlagsIgnoreErrors,
     ObjectFlags,
     operatorPart,
     PropertyAccessExpression,
@@ -110,7 +111,7 @@ import {
     VariableDeclaration,
 } from "./_namespaces/ts.js";
 
-const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
 
 // TODO(drosen): use contextual SemanticMeaning.
 /** @internal */
diff --git a/tests/baselines/reference/ArrowFunction1.types b/tests/baselines/reference/ArrowFunction1.types
index e05ceb280edb9..c0f36308a4c3a 100644
--- a/tests/baselines/reference/ArrowFunction1.types
+++ b/tests/baselines/reference/ArrowFunction1.types
@@ -3,9 +3,9 @@
 === ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^   ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^   ^^^^^^^^^
+>               : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
index 9bce00088aa1c..3b9a05088c0b9 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
@@ -22,7 +22,7 @@ module clodule1 {
 
     function f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 8275e4222820c..7b46acd91acdd 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -6274,39 +6274,44 @@ declare namespace ts {
          */
         runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
-    enum NodeBuilderFlags {
-        None = 0,
-        NoTruncation = 1,
-        WriteArrayAsGenericType = 2,
-        GenerateNamesForShadowedTypeParams = 4,
-        UseStructuralFallback = 8,
-        ForbidIndexedAccessSymbolReferences = 16,
-        WriteTypeArgumentsOfSignature = 32,
-        UseFullyQualifiedType = 64,
-        UseOnlyExternalAliasing = 128,
-        SuppressAnyReturnType = 256,
-        WriteTypeParametersInQualifiedName = 512,
-        MultilineObjectLiterals = 1024,
-        WriteClassExpressionAsTypeLiteral = 2048,
-        UseTypeOfFunction = 4096,
-        OmitParameterModifiers = 8192,
-        UseAliasDefinedOutsideCurrentScope = 16384,
-        UseSingleQuotesForStringLiteralType = 268435456,
-        NoTypeReduction = 536870912,
-        OmitThisParameter = 33554432,
-        AllowThisInObjectLiteral = 32768,
-        AllowQualifiedNameInPlaceOfIdentifier = 65536,
-        AllowAnonymousIdentifier = 131072,
-        AllowEmptyUnionOrIntersection = 262144,
-        AllowEmptyTuple = 524288,
-        AllowUniqueESSymbolType = 1048576,
-        AllowEmptyIndexInfoType = 2097152,
-        AllowNodeModulesRelativePaths = 67108864,
-        IgnoreErrors = 70221824,
-        InObjectTypeLiteral = 4194304,
-        InTypeAlias = 8388608,
-        InInitialEntityName = 16777216,
-    }
+    type NodeBuilderFlags = bigint;
+    const NodeBuilderFlags: {
+        None: bigint;
+        NoTruncation: bigint;
+        WriteArrayAsGenericType: bigint;
+        GenerateNamesForShadowedTypeParams: bigint;
+        UseStructuralFallback: bigint;
+        ForbidIndexedAccessSymbolReferences: bigint;
+        WriteTypeArgumentsOfSignature: bigint;
+        UseFullyQualifiedType: bigint;
+        UseOnlyExternalAliasing: bigint;
+        SuppressAnyReturnType: bigint;
+        WriteTypeParametersInQualifiedName: bigint;
+        MultilineObjectLiterals: bigint;
+        WriteClassExpressionAsTypeLiteral: bigint;
+        UseTypeOfFunction: bigint;
+        OmitParameterModifiers: bigint;
+        UseAliasDefinedOutsideCurrentScope: bigint;
+        UseSingleQuotesForStringLiteralType: bigint;
+        NoTypeReduction: bigint;
+        OmitThisParameter: bigint;
+        AllowThisInObjectLiteral: bigint;
+        AllowQualifiedNameInPlaceOfIdentifier: bigint;
+        AllowAnonymousIdentifier: bigint;
+        AllowEmptyUnionOrIntersection: bigint;
+        AllowEmptyTuple: bigint;
+        AllowUniqueESSymbolType: bigint;
+        AllowEmptyIndexInfoType: bigint;
+        /** @internal */ WriteComputedProps: bigint;
+        /** @internal */ NoSyntacticPrinter: bigint;
+        AllowNodeModulesRelativePaths: bigint;
+        /** @internal */ DoNotIncludeSymbolChain: bigint;
+        /** @internal */ AllowUnresolvedNames: bigint;
+        InObjectTypeLiteral: bigint;
+        InTypeAlias: bigint;
+        InInitialEntityName: bigint;
+    };
+    const NodeBuilderFlagsIgnoreErrors: bigint;
     enum TypeFormatFlags {
         None = 0,
         NoTruncation = 1,
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index e0920ba869bb1..23e3bcd89500f 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -38,16 +38,16 @@ function f() {
 
 interface I {
     method(args: typeof arguments): void;
->method : (args: typeof arguments) => void
->       : ^    ^^                ^^^^^    
+>method : (args: any) => void
+>       : ^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
 >          : ^^^
 
     fn: (args: typeof arguments) => void;
->fn : (args: typeof arguments) => void
->   : ^    ^^                ^^^^^    
+>fn : (args: any) => void
+>   : ^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
@@ -66,8 +66,8 @@ interface I {
 >          : ^^^
 
     construct: new (args: typeof arguments) => void;
->construct : new (args: typeof arguments) => void
->          : ^^^^^    ^^                ^^^^^    
+>construct : new (args: any) => void
+>          : ^^^^^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
index 3477e908a4412..1986b06942f71 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
@@ -6,8 +6,8 @@ class X {
 >  : ^
 
     public f(a: Array) { }
->f : (a: Array) => void
->  : ^ ^^     ^^^^^^^^^
+>f : (a: any) => void
+>  : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
index 2059b6a1d0af5..5c6b02e6e38ea 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
index c67538371823d..82694aa672ecf 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
index b69055519df93..1e9e5af30123a 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/badExternalModuleReference.types b/tests/baselines/reference/badExternalModuleReference.types
index 755cfd5afa70b..e2161d64ff872 100644
--- a/tests/baselines/reference/badExternalModuleReference.types
+++ b/tests/baselines/reference/badExternalModuleReference.types
@@ -7,7 +7,7 @@ import a1 = require("garbage");
 
 export declare var a: {
 >a : { (): a1.connectExport; test1: a1.connectModule; }
->  : ^^^^^^                ^^^^^^^^^                ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     test1: a1.connectModule;
 >test1 : a1.connectModule
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index e090eac053745..cc2b3a9a5c1c1 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -147,7 +147,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
 >defer : <R>(dit: typeof Promise) => Promise.Resolver<R>
->      : ^ ^^   ^^              ^^^^^                   
+>      : ^ ^^   ^^              ^^^^^^^^^^^^^^^^^^^^^^^^
 >dit : typeof Promise
 >    : ^^^^^^^^^^^^^^
 >Promise : typeof Promise
diff --git a/tests/baselines/reference/circularBaseTypes.types b/tests/baselines/reference/circularBaseTypes.types
index f15db1ed5a721..9b237c0c33002 100644
--- a/tests/baselines/reference/circularBaseTypes.types
+++ b/tests/baselines/reference/circularBaseTypes.types
@@ -15,8 +15,8 @@ type M3 = M2[keyof M2];  // Error
 >   : ^^^
 
 function f(m: M3) {
->f : (m: M3) => any
->  : ^ ^^  ^^^^^^^^
+>f : (m: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >m : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index d9fd54eb04428..4b8e2b93060cb 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -84,8 +84,8 @@ module m1 {
     }
 
     export function f4(arg1: 
->f4 : (arg1: { [number]: C1; }) => void
->   : ^    ^^                 ^^^^^^^^^
+>f4 : (arg1: {}) => void
+>   : ^    ^^  ^^^^^^^^^
 >arg1 : {}
 >     : ^^
     {
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 1732ef9e66df6..07ec406a76ef9 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -859,11 +859,11 @@ module TypeScriptAllInOne {
 >xx.Foo() : bool
 >         : ^^^^
 >xx.Foo : () => bool
->       : ^^^^^^    
+>       : ^^^^^^^^^^
 >xx : IF
 >   : ^^
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
 >0 : 0
 >  : ^
 >1 : 1
@@ -1290,7 +1290,7 @@ module TypeScriptAllInOne {
     interface IF {
         Foo(): bool;
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
     }
 
     class CLASS implements IF {
@@ -1323,7 +1323,7 @@ module TypeScriptAllInOne {
         }
         public Foo(): bool {
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
 
             var myEvent = () => { return 1; };
 >myEvent : () => number
diff --git a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
index 1e5e4b1c668a0..ff27f866ca994 100644
--- a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
+++ b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
@@ -21,10 +21,10 @@ import { type Type } from "./type";
 >     : ^^^
 
 export const foo = { ...({} as Type) };
->foo : { x?: { [Enum.A]: 0; }; }
->    : ^^^^^^                ^^^
->{ ...({} as Type) } : { x?: { [Enum.A]: 0; }; }
->                    : ^^^^^^                ^^^
+>foo : { x?: {}; }
+>    : ^^^^^^  ^^^
+>{ ...({} as Type) } : { x?: {}; }
+>                    : ^^^^^^  ^^^
 >({} as Type) : Type
 >             : ^^^^
 >{} as Type : Type
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types
index c159268c6c1fe..81f1035e5f2c0 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.types
+++ b/tests/baselines/reference/errorsInGenericTypeReference.types
@@ -45,9 +45,9 @@ class testClass2<T> {
 }
 var tc2 = new testClass2<{ x: V }>(); // error: could not find symbol V
 >tc2 : testClass2<{ x: V; }>
->    : ^^^^^^^^^^^^^^^^ ^^^^
+>    : ^^^^^^^^^^^^^^^^^^^^^
 >new testClass2<{ x: V }>() : testClass2<{ x: V; }>
->                           : ^^^^^^^^^^^^^^^^ ^^^^
+>                           : ^^^^^^^^^^^^^^^^^^^^^
 >testClass2 : typeof testClass2
 >           : ^^^^^^^^^^^^^^^^^
 >x : V
@@ -73,15 +73,15 @@ class testClass3 {
 
     set a(value: Foo<{ x: V }>) { } // error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >value : Foo<{ x: V; }>
->      : ^^^^^^^^^ ^^^^
+>      : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^ ^^^^
+>         : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 }
@@ -100,7 +100,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 >testFunction2 : (p: Foo<{ x: V; }>) => void
 >              : ^ ^^              ^^^^^^^^^
 >p : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -108,7 +108,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 // in var type annotation
 var f: Foo<{ x: V }>; // error: could not find symbol V
 >f : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -149,7 +149,7 @@ class testClass7 extends Foo<{ x: V }> { } // error: could not find symbol V
 >testClass7 : testClass7
 >           : ^^^^^^^^^^
 >Foo : Foo<{ x: V; }>
->    : ^^^^^^^^^ ^^^^
+>    : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -166,7 +166,7 @@ class testClass8 implements IFoo<{ x: V }> { } // error: could not find symbol V
 interface testInterface2 {
     new (a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 >x : V
@@ -182,7 +182,7 @@ interface testInterface2 {
 >method : (a: Foo<{ x: V; }>) => Foo<{ x: V; }>
 >       : ^ ^^              ^^^^^              
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 >x : V
@@ -190,7 +190,7 @@ interface testInterface2 {
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^ ^^^^
+>         : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 }
diff --git a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
index 03d26bb153cbd..e92435770566b 100644
--- a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
+++ b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
@@ -17,7 +17,7 @@ class Foo {
 
     f(@decorate user: A.B.C.D.E): void {}
 >f : (user: A.B.C.D.E) => void
->  : ^    ^^         ^^^^^    
+>  : ^    ^^^^^^^^^^^^^^^^    
 >decorate : any
 >         : ^^^
 >user : A.B.C.D.E
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 45c953a6edaec..1166e17b3ee19 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -31,7 +31,7 @@ declare module "m2" {
 
     function Z2(): X.I;
 >Z2 : () => X.I
->   : ^^^^^^   
+>   : ^^^^^^^^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index 7cfc7f29a1799..6479046c76e2e 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -19,7 +19,7 @@ declare module "m" {
 
     export function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^     
+>    : ^^^^^^^^^^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
index 6abf489b85771..5bd8e94d07540 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
@@ -18,7 +18,7 @@ export declare function foo(): X.foo;
 
 export declare function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^     
+>    : ^^^^^^^^^^^
 >X : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types
index 0cc9fc76332e3..4278407983217 100644
--- a/tests/baselines/reference/extendArray.types
+++ b/tests/baselines/reference/extendArray.types
@@ -36,7 +36,7 @@ declare module _Core {
 >collect : (fn: (e: _element) => _element[]) => any[]
 >        : ^  ^^                           ^^^^^     
 >fn : (e: _element) => _element[]
->   : ^ ^^        ^^^^^          
+>   : ^ ^^^^^^^^^^^^^^^          
 >e : _element
 >  : ^^^^^^^^
   }
diff --git a/tests/baselines/reference/functionTypesLackingReturnTypes.types b/tests/baselines/reference/functionTypesLackingReturnTypes.types
index eee1024a9b1d5..1daafaa5f397a 100644
--- a/tests/baselines/reference/functionTypesLackingReturnTypes.types
+++ b/tests/baselines/reference/functionTypesLackingReturnTypes.types
@@ -6,7 +6,7 @@ function f(x: ()) {
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^   
+>  : ^^^^^^^^^
 }
 
 // Error (no '=>')
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
index a411dc6efcaa1..e09690cad7040 100644
--- a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
@@ -2,8 +2,8 @@
 
 === functionVariableInReturnTypeAnnotation.ts ===
 function bar(): typeof b {
->bar : () => typeof b
->    : ^^^^^^        
+>bar : () => any
+>    : ^^^^^^^^^
 >b : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index 09fe11a54013c..6dfc4569d313d 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -435,7 +435,7 @@ module TU {
 >x : T
 >  : ^
 >b : (x: U) => U
->  : ^ ^^ ^^^^^ 
+>  : ^ ^^^^^^^^^
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
index 673dd58110312..94966b98ecdd6 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
@@ -8,9 +8,9 @@ class Foo<T> {
 
     static a = (n: T) => { };
 >a : (n: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >(n: T) => { } : (n: T) => void
->              : ^ ^^ ^^^^^^^^^
+>              : ^ ^^^^^^^^^^^^
 >n : T
 >  : ^
 
@@ -34,9 +34,9 @@ class Foo<T> {
 >((x: T) => x || undefined)(null) : any
 >                                 : ^^^
 >((x: T) => x || undefined) : (x: T) => any
->                           : ^ ^^ ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^
 >(x: T) => x || undefined : (x: T) => any
->                         : ^ ^^ ^^^^^^^^
+>                         : ^ ^^^^^^^^^^^
 >x : T
 >  : ^
 >x || undefined : any
@@ -48,9 +48,9 @@ class Foo<T> {
 
     static e = function (x: T) { return null; }
 >e : (x: T) => any
->  : ^ ^^ ^^^^^^^^
+>  : ^ ^^^^^^^^^^^
 >function (x: T) { return null; } : (x: T) => any
->                                 : ^ ^^ ^^^^^^^^
+>                                 : ^ ^^^^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
index 7aad01faad3f2..5d3d5fe11f6e9 100644
--- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
@@ -19,8 +19,8 @@ foo((arg: Foo) => { return arg.x; });
 >                                     : ^^^
 >foo : (a: any) => any
 >    : ^ ^^^^^^^^^^^^^
->(arg: Foo) => { return arg.x; } : (arg: Foo) => any
->                                : ^   ^^   ^^^^^^^^
+>(arg: Foo) => { return arg.x; } : (arg: any) => any
+>                                : ^   ^^^^^^^^^^^^^
 >arg : any
 >    : ^^^
 >arg.x : any
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
index 74f654b1a760e..7af45bae740c9 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
@@ -10,8 +10,8 @@ module TypeScript {
 >           : ^^^^^^^^^^^^^^^^^^^
 
         static create<A,B,C>(arg1: any, arg2?: any, arg3?: any): MemberName {
->create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => MemberName
->       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => any
+>       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >arg1 : any
 >     : ^^^
 >arg2 : any
@@ -45,8 +45,8 @@ module TypeScript {
 >             : ^^^
 
         public toString<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) {
->toString : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) => any
->         : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^^^^^^^
+>toString : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean) => any
+>         : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -61,12 +61,12 @@ module TypeScript {
 >                                                                : ^^^
 >this.getScopedNameEx(scopeSymbol, useConstraintInName) : any
 >                                                       : ^^^
->this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                     : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                     : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >this : this
 >     : ^^^^
->getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -79,8 +79,8 @@ module TypeScript {
 >  : ^^^
         }
         public getScopedNameEx<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) {
->getScopedNameEx : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -191,12 +191,12 @@ module TypeScript {
                 return MemberName.create(elementMemberName, "", "[]");
 >MemberName.create(elementMemberName, "", "[]") : any
 >                                               : ^^^
->MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
->                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
+>                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >MemberName : typeof MemberName
 >           : ^^^^^^^^^^^^^^^^^
->create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
->       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
+>       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >elementMemberName : any
 >                  : ^^^
 >"" : ""
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
index 7d12f8b399ff6..b8d61e618b3d4 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
index b289f43a0a8db..428b8ad4ca384 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
@@ -18,14 +18,14 @@ var c: C;
 >  : ^^^
 
 var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,10 +36,10 @@ var d: { [x: C]: C };
 >  : ^^^
 
 var e = (x: C) => { var y: C; return y; }
->e : (x: C) => any
->  : ^ ^^ ^^^^^^^^
->(x: C) => { var y: C; return y; } : (x: C) => any
->                                  : ^ ^^ ^^^^^^^^
+>e : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>(x: C) => { var y: C; return y; } : (x: any) => any
+>                                  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -48,8 +48,8 @@ var e = (x: C) => { var y: C; return y; }
 >  : ^^^
 
 function f(x: C): C { var y: C; return y; }
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -58,12 +58,12 @@ function f(x: C): C { var y: C; return y; }
 >  : ^^^
 
 var g = function f(x: C): C { var y: C; return y; }
->g : (x: C) => C
->  : ^ ^^ ^^^^^ 
->function f(x: C): C { var y: C; return y; } : (x: C) => C
->                                            : ^ ^^ ^^^^^ 
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>function f(x: C): C { var y: C; return y; } : (x: any) => any
+>                                            : ^ ^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
index 02c324df4a2ba..d618ec2c442c3 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
@@ -15,14 +15,14 @@ var c: I;
 >  : ^^^
 
 var a: { x: I };
->a : { x: I; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 var b: { (x: I): I };
->b : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -33,10 +33,10 @@ var d: { [x: I]: I };
 >  : ^^^
 
 var e = (x: I) => { var y: I; return y; }
->e : (x: I) => any
->  : ^ ^^ ^^^^^^^^
->(x: I) => { var y: I; return y; } : (x: I) => any
->                                  : ^ ^^ ^^^^^^^^
+>e : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>(x: I) => { var y: I; return y; } : (x: any) => any
+>                                  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -45,8 +45,8 @@ var e = (x: I) => { var y: I; return y; }
 >  : ^^^
 
 function f(x: I): I { var y: I; return y; }
->f : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -55,12 +55,12 @@ function f(x: I): I { var y: I; return y; }
 >  : ^^^
 
 var g = function f(x: I): I { var y: I; return y; }
->g : (x: I) => I
->  : ^ ^^ ^^^^^ 
->function f(x: I): I { var y: I; return y; } : (x: I) => I
->                                            : ^ ^^ ^^^^^ 
->f : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>function f(x: I): I { var y: I; return y; } : (x: any) => any
+>                                            : ^ ^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
index 1b4e7fc2df006..65c8e58e17514 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.types b/tests/baselines/reference/genericsWithoutTypeParameters1.types
index d53f00d368de8..37257696d399b 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.types
@@ -33,8 +33,8 @@ var i2: I<C>;
 >   : ^^^^^^
 
 function foo(x: C, y: I) { }
->foo : (x: C, y: I) => void
->    : ^ ^^ ^^ ^^ ^^^^^^^^^
+>foo : (x: any, y: any) => void
+>    : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -49,8 +49,8 @@ function foo2(x: C<I>, y: I<C>) { }
 >  : ^^^^^^
 
 var x: { a: C } = { a: new C<number>() };
->x : { a: C; }
->  : ^^^^^ ^^^
+>x : { a: any; }
+>  : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >{ a: new C<number>() } : { a: C<number>; }
@@ -63,8 +63,8 @@ var x: { a: C } = { a: new C<number>() };
 >  : ^^^^^^^^
 
 var x2: { a: I } = { a: { bar() { return 1 } } };
->x2 : { a: I; }
->   : ^^^^^ ^^^
+>x2 : { a: any; }
+>   : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >{ a: { bar() { return 1 } } } : { a: { bar(): number; }; }
@@ -106,8 +106,8 @@ class A<T> { }
 >  : ^^^^
 
 function f<T>(x: T): A {
->f : <T>(x: T) => A
->  : ^ ^^ ^^ ^^^^^ 
+>f : <T>(x: T) => any
+>  : ^ ^^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/importTypeGeneric.types b/tests/baselines/reference/importTypeGeneric.types
index 89f99fcf06016..80bda6bda5986 100644
--- a/tests/baselines/reference/importTypeGeneric.types
+++ b/tests/baselines/reference/importTypeGeneric.types
@@ -14,8 +14,8 @@ export interface Foo {
 }
 === usage.ts ===
 export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
->getFooFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo
->           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^             
+>getFooFrom : <T extends "./a" | "./b">(v: T) => any
+>           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
 >v : T
 >  : ^
 
@@ -27,8 +27,8 @@ export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 }
 
 export function getFooValueFrom<T extends "./a" | "./b">(v: T): import(T).Foo["a"] {
->getFooValueFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo["a"]
->                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^                  
+>getFooValueFrom : <T extends "./a" | "./b">(v: T) => any
+>                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
 >v : T
 >  : ^
 
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types
index f935bc74710e4..4595882098610 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.types
+++ b/tests/baselines/reference/importedModuleAddToGlobal.types
@@ -44,7 +44,7 @@ module C {
 
     function hello(): b.B { return null; }
 >hello : () => b.B
->      : ^^^^^^   
+>      : ^^^^^^^^^
 >b : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/intrinsicKeyword.types b/tests/baselines/reference/intrinsicKeyword.types
index ae043729da5d0..992bddd32605f 100644
--- a/tests/baselines/reference/intrinsicKeyword.types
+++ b/tests/baselines/reference/intrinsicKeyword.types
@@ -7,7 +7,7 @@ let e1: intrinsic;
 
 let e2: { intrinsic: intrinsic };
 >e2 : { intrinsic: intrinsic; }
->   : ^^^^^^^^^^^^^         ^^^
+>   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >intrinsic : intrinsic
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
index cbfbd71f3ce4b..cc6fd4db7284d 100644
--- a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
+++ b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
@@ -6,5 +6,5 @@ function f(x) {}
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^   
+>  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocOuterTypeParameters1.types b/tests/baselines/reference/jsdocOuterTypeParameters1.types
index e09bc426c3e91..104c89b19a52e 100644
--- a/tests/baselines/reference/jsdocOuterTypeParameters1.types
+++ b/tests/baselines/reference/jsdocOuterTypeParameters1.types
@@ -4,9 +4,9 @@
 /** @return {T} */
 const dedupingMixin = function(mixin) {};
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^ 
+>              : ^     ^^^^^^^^^^^
 >function(mixin) {} : (mixin: any) => T
->                   : ^     ^^^^^^^^^^ 
+>                   : ^     ^^^^^^^^^^^
 >mixin : any
 >      : ^^^
 
@@ -17,7 +17,7 @@ const PropertyAccessors = dedupingMixin(() => {
 >dedupingMixin(() => {  class Bar {    static bar() { this.prototype.foo(); }  }}) : T
 >                                                                                  : ^
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^ 
+>              : ^     ^^^^^^^^^^^
 >() => {  class Bar {    static bar() { this.prototype.foo(); }  }} : () => void
 >                                                                   : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
index 03e0733209e4e..60aba05e6ac88 100644
--- a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
+++ b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
@@ -7,5 +7,5 @@
  */
 let x;
 >x : (arg0: any, arg1: foo) => any
->  : ^^^^^^^   ^^^^^^^^   ^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
index fa4c2be52ec06..7e9a79fe8921a 100644
--- a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
+++ b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
@@ -5,8 +5,8 @@
  * @param {Ty} x
  */
 function f(x) {}
->f : (x: Ty) => void
->  : ^ ^^  ^^^^^^^^^
+>f : (x: CantResolveThis) => void
+>  : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : CantResolveThis
 >  : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/lambdaArgCrash.types b/tests/baselines/reference/lambdaArgCrash.types
index 2905a3006e235..b04d53e722cd8 100644
--- a/tests/baselines/reference/lambdaArgCrash.types
+++ b/tests/baselines/reference/lambdaArgCrash.types
@@ -69,7 +69,7 @@ class ItemSetEvent extends Event {
 >add : (listener: (items: ItemSet) => void) => void
 >    : ^        ^^                        ^^^^^^^^^
 >listener : (items: ItemSet) => void
->         : ^     ^^       ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^    
 >items : ItemSet
 >      : ^^^^^^^
 
@@ -83,7 +83,7 @@ class ItemSetEvent extends Event {
 >add : (listener: () => any) => void
 >    : ^        ^^         ^^^^^    
 >listener : (items: ItemSet) => void
->         : ^     ^^       ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^    
 
 	}
 
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index bab7b13a03a3b..276995eccc15c 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -25,7 +25,7 @@ function f2() {
     // Local types are not in scope in parameters and return types
     function f(x: T): T {
 >f : (x: T) => T
->  : ^ ^^ ^^^^^ 
+>  : ^ ^^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/missingTypeArguments1.types b/tests/baselines/reference/missingTypeArguments1.types
index 4c52121e6efdb..7674a030f35cc 100644
--- a/tests/baselines/reference/missingTypeArguments1.types
+++ b/tests/baselines/reference/missingTypeArguments1.types
@@ -11,8 +11,8 @@ class X<T> {
 >  : ^^^^
 
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 }
 var a: X<number>;
 >a : X<number>
@@ -73,8 +73,8 @@ class X6<T> {
 >   : ^^^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 }
 var a6: X6<number>;
 >a6 : X6<number>
diff --git a/tests/baselines/reference/missingTypeArguments2.types b/tests/baselines/reference/missingTypeArguments2.types
index 7e209f39c7ca0..c5c87c749a5ef 100644
--- a/tests/baselines/reference/missingTypeArguments2.types
+++ b/tests/baselines/reference/missingTypeArguments2.types
@@ -6,12 +6,12 @@ class A<T> { }
 >  : ^^^^
 
 var x: () => A;
->x : () => A
->  : ^^^^^^ 
+>x : () => any
+>  : ^^^^^^^^^
 
 (a: A) => { };
->(a: A) => { } : (a: A) => void
->              : ^ ^^ ^^^^^^^^^
+>(a: A) => { } : (a: any) => void
+>              : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -20,6 +20,6 @@ var y: A<A>;
 >  : ^^^^^^
 
 (): A => null;
->(): A => null : () => A
->              : ^^^^^^ 
+>(): A => null : () => any
+>              : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index f120426e0aa12..088b4523199a2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -80,7 +80,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^ 
+>    : ^^^^^^^
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 17d9fc3f6e23e..8e0116c6d7fe1 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -75,7 +75,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^ 
+>    : ^^^^^^^
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleExportAssignment7.types b/tests/baselines/reference/moduleExportAssignment7.types
index 4124a6d377230..2ccb64f0d5d12 100644
--- a/tests/baselines/reference/moduleExportAssignment7.types
+++ b/tests/baselines/reference/moduleExportAssignment7.types
@@ -159,8 +159,8 @@ function jstypes(a, b, c, d, e, f, g) {
  * @param {typeof import("./mod").literal} g
  */
 function jsvalues(a, b, c, d, e, f, g) {
->jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
->         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
+>jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
+>         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
 >a : typeof Thing
 >  : ^^^^^^^^^^^^
 >b : typeof AnotherThing
@@ -227,8 +227,8 @@ function jsvalues(a, b, c, d, e, f, g) {
 
 === index.ts ===
 function types(
->types : (a: import("./mod").Thing, b: import("./mod").AnotherThing, c: import("./mod").foo, d: import("./mod").qux, e: import("./mod").baz, f: import("./mod").buz, g: import("./mod").literal) => any
->      : ^ ^^                     ^^ ^^                            ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                       ^^^^^^^^
+>types : (a: any, b: any, c: any, d: any, e: any, f: import("./mod").buz, g: any) => any
+>      : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^                   ^^ ^^^^^^^^^^^^^
 
     a: import('./mod').Thing,
 >a : any
@@ -309,8 +309,8 @@ function types(
 }
 
 function values(
->values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
->       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
+>values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
+>       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
 
     a: typeof import('./mod').Thing,
 >a : typeof Thing
diff --git a/tests/baselines/reference/moduleInTypePosition1.types b/tests/baselines/reference/moduleInTypePosition1.types
index 893230662904c..54a4064d3a58d 100644
--- a/tests/baselines/reference/moduleInTypePosition1.types
+++ b/tests/baselines/reference/moduleInTypePosition1.types
@@ -8,9 +8,9 @@ import WinJS = require('./moduleInTypePosition1_0');
 
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^     ^^^^^^^^^
+>                   : ^  ^^^^^^^^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
index ab36f42fb2ec6..689b28d1d837e 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
@@ -21,7 +21,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(role: Role) =>        this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : (role: Role) => any
->                                                                                                                          : ^    ^^    ^^^^^^^^
+>                                                                                                                          : ^    ^^^^^^^^^^^^^^
 >role : Role
 >     : ^^^^
 
@@ -49,7 +49,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(data: ng.IHttpPromiseCallbackArg<Role>) => data.data : (data: ng.IHttpPromiseCallbackArg<Role>) => any
->                                                      : ^    ^^                                ^^^^^^^^
+>                                                      : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >data : ng.IHttpPromiseCallbackArg<Role>
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ng : any
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.types b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
index aa78989a9c06c..11c001306ea4f 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.types
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
@@ -6,8 +6,8 @@ class A<T>{
 >  : ^^^^
  
  foo(): A{
->foo : () => A
->    : ^^^^^^ 
+>foo : () => any
+>    : ^^^^^^^^^
 
   return null;
  }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
index e5b849c6a2add..9e3db23d9d6c5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
@@ -62,24 +62,24 @@ function foo3(x: any) { }
 >  : ^^^
 
 function foo4(x: typeof b);
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: typeof b); // error
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: any) { }
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/parser553699.types b/tests/baselines/reference/parser553699.types
index fcc70394c1163..8fb75c3898941 100644
--- a/tests/baselines/reference/parser553699.types
+++ b/tests/baselines/reference/parser553699.types
@@ -8,7 +8,7 @@ class Foo {
   constructor() { }
   public banana (x: public) { }
 >banana : (x: public) => void
->       : ^ ^^      ^^^^^^^^^
+>       : ^ ^^^^^^^^^^^^^^^^^
 >x : public
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.types b/tests/baselines/reference/parserArrowFunctionExpression10.types
index bc288ad26b247..0b639062c960d 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression10.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression10.types
@@ -3,11 +3,11 @@
 === fileJs.js ===
 a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colon
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^ 
+>                            : ^ ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^ 
+>               : ^ ^^^^^^^^^^^
 >b : any
 >  : ^^^
 >(d) : any
@@ -24,11 +24,11 @@ a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colo
 === fileTs.ts ===
 a ? (b) : c => (d) : e => f
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^ 
+>                            : ^ ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^ 
+>               : ^ ^^^^^^^^^^^
 >b : any
 >  : ^^^
 >(d) : any
diff --git a/tests/baselines/reference/parserArrowFunctionExpression17.types b/tests/baselines/reference/parserArrowFunctionExpression17.types
index 72350d6f59991..44f811dbf5975 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression17.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression17.types
@@ -9,7 +9,7 @@ a ? b : (c) : d => e // Not legal JS; "Unexpected token ':'" at last colon
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^ 
+>             : ^ ^^^^^^^^^^^
 >c : any
 >  : ^^^
 >e : any
@@ -24,7 +24,7 @@ a ? b : (c) : d => e
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^ 
+>             : ^ ^^^^^^^^^^^
 >c : any
 >  : ^^^
 >e : any
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
index b1e08f535a2e3..c081e3e394ad1 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
@@ -3,7 +3,7 @@
 === parserErrantEqualsGreaterThanAfterFunction2.ts ===
 function f(p: A) => p;
 >f : (p: A) => any
->  : ^ ^^ ^^^^^^^^
+>  : ^ ^^^^^^^^^^^
 >p : A
 >  : ^
 >p : any
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
index 938154e596aeb..72675341e2934 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
@@ -7,7 +7,7 @@ class Foo {
 
     public banana (x: break) { }
 >banana : (x: break) => void
->       : ^ ^^     ^^^^^^^^^
+>       : ^ ^^^^^^^^^^^^^^^^
 >x : break
 >  : ^^^^^
 }
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.types b/tests/baselines/reference/parserGenericsInTypeContexts1.types
index 35f7edf331487..6845b6326233c 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.types
@@ -37,14 +37,14 @@ var v6: K<T>[];
 
 function f1(a: E<T>) {
 >f1 : (a: E<T>) => void
->   : ^ ^^    ^^^^^^^^^
+>   : ^ ^^^^^^^^^^^^^^^
 >a : E<T>
 >  : ^^^^
 }
 
 function f2(): F<T> {
 >f2 : () => F<T>
->   : ^^^^^^    
+>   : ^^^^^^^^^^
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.types b/tests/baselines/reference/parserGenericsInTypeContexts2.types
index 98fe0538ca6f5..928bcee3118b6 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.types
@@ -37,14 +37,14 @@ var v6: K<X<T>, Y<Z<T>>>[];
 
 function f1(a: E<X<T>, Y<Z<T>>>) {
 >f1 : (a: E<X<T>, Y<Z<T>>>) => void
->   : ^ ^^                ^^^^^^^^^
+>   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : E<X<T>, Y<Z<T>>>
 >  : ^^^^^^^^^^^^^^^^
 }
 
 function f2(): F<X<T>, Y<Z<T>>> {
 >f2 : () => F<X<T>, Y<Z<T>>>
->   : ^^^^^^                
+>   : ^^^^^^^^^^^^^^^^^^^^^^
 }
 
 
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
index 1745d213e848e..e1c3c66d02847 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
@@ -7,7 +7,7 @@ class C {
 
     where(filter: Iterator<T, boolean>): Query<T> {
 >where : (filter: Iterator<T, boolean>) => Query<T>
->      : ^      ^^                    ^^^^^        
+>      : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >filter : Iterator<T, boolean>
 >       : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserObjectType5.types b/tests/baselines/reference/parserObjectType5.types
index fe93d5cf1efd4..620abab9f30ff 100644
--- a/tests/baselines/reference/parserObjectType5.types
+++ b/tests/baselines/reference/parserObjectType5.types
@@ -3,7 +3,7 @@
 === parserObjectType5.ts ===
 var v: {
 >v : { <T>(): any; A: B; }
->  : ^^^ ^^^^^^^^^^^^^ ^^^
+>  : ^^^ ^^^^^^^^^^^^^^^^^
 
    A: B
 >A : B
diff --git a/tests/baselines/reference/parserObjectType6.types b/tests/baselines/reference/parserObjectType6.types
index 9d487d9bbee74..990045de90b02 100644
--- a/tests/baselines/reference/parserObjectType6.types
+++ b/tests/baselines/reference/parserObjectType6.types
@@ -3,7 +3,7 @@
 === parserObjectType6.ts ===
 var v: {
 >v : { a: B; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 
    a: B
 >a : B
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index 3ba5196d8a27d..d81700003e0da 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -886,7 +886,7 @@ module TypeScript {
 
     function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number,
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tokenId : TokenID
 >        : ^^^^^^^
 >reservation : number
@@ -1015,7 +1015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Any, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "any", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Any : TokenID.Any
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1065,7 +1065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bool, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "boolean", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Bool : TokenID.Bool
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1115,7 +1115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Break, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "break", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Break : TokenID.Break
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1165,7 +1165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Case, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "case", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Case : TokenID.Case
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1215,7 +1215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Catch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "catch", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Catch : TokenID.Catch
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1265,7 +1265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Class, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "class", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Class : TokenID.Class
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1315,7 +1315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Const, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "const", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Const : TokenID.Const
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1365,7 +1365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Continue, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "continue", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Continue : TokenID.Continue
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1415,7 +1415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Debugger, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.Debugger, "debugger", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Debugger : TokenID.Debugger
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1465,7 +1465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Default, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "default", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Default : TokenID.Default
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1515,7 +1515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Delete, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Delete, "delete", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Delete : TokenID.Delete
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1565,7 +1565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Do, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "do", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Do : TokenID.Do
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1615,7 +1615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Else, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "else", ErrorRecoverySet.Else) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Else : TokenID.Else
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1665,7 +1665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Enum, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "enum", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Enum : TokenID.Enum
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1715,7 +1715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Export, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "export", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Export : TokenID.Export
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1765,7 +1765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Extends, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "extends", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Extends : TokenID.Extends
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1815,7 +1815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Declare, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "declare", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Declare : TokenID.Declare
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1865,7 +1865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.False, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "false", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.False : TokenID.False
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1915,7 +1915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Finally, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "finally", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Finally : TokenID.Finally
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1965,7 +1965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.For, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "for", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.For : TokenID.For
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2015,7 +2015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Function, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "function", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Function : TokenID.Function
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2065,7 +2065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Constructor, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "constructor", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Constructor : TokenID.Constructor
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2115,7 +2115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Get, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "get", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Get : TokenID.Get
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2165,7 +2165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Set, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "set", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Set : TokenID.Set
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2215,7 +2215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.If, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "if", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.If : TokenID.If
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2265,7 +2265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Implements, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "implements", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Implements : TokenID.Implements
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2315,7 +2315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Import, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "import", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Import : TokenID.Import
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2365,7 +2365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.In, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.In, OperatorPrecedence.None, NodeType.None, "in", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.In : TokenID.In
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2415,7 +2415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.InstanceOf, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.InstOf, OperatorPrecedence.None, NodeType.None, "instanceof", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.InstanceOf : TokenID.InstanceOf
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2465,7 +2465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Interface, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "interface", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Interface : TokenID.Interface
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2515,7 +2515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Let, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "let", ErrorRecoverySet.None) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Let : TokenID.Let
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2565,7 +2565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Module, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "module", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Module : TokenID.Module
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2615,7 +2615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.New, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "new", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.New : TokenID.New
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2665,7 +2665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Number, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "number", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Number : TokenID.Number
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2715,7 +2715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Null, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "null", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Null : TokenID.Null
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2765,7 +2765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Package, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "package", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Package : TokenID.Package
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2815,7 +2815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Private, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "private", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Private : TokenID.Private
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2865,7 +2865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Protected, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "protected", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Protected : TokenID.Protected
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2915,7 +2915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Public, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "public", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Public : TokenID.Public
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2965,7 +2965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Return, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "return", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Return : TokenID.Return
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3015,7 +3015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Static, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "static", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Static : TokenID.Static
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3065,7 +3065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.String, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "string", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.String : TokenID.String
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3115,7 +3115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Super, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "super", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Super : TokenID.Super
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3165,7 +3165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Switch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "switch", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Switch : TokenID.Switch
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3215,7 +3215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.This, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "this", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.This : TokenID.This
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3265,7 +3265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Throw, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "throw", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Throw : TokenID.Throw
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3315,7 +3315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.True, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "true", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.True : TokenID.True
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3365,7 +3365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Try, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "try", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Try : TokenID.Try
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3415,7 +3415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.TypeOf, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Typeof, "typeof", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.TypeOf : TokenID.TypeOf
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3465,7 +3465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Var, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "var", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Var : TokenID.Var
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3515,7 +3515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Void, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Void, "void", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Void : TokenID.Void
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3565,7 +3565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.With, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.With, "with", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.With : TokenID.With
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3615,7 +3615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.While, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "while", ErrorRecoverySet.While) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.While : TokenID.While
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3665,7 +3665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Yield, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "yield", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Yield : TokenID.Yield
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3715,7 +3715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Identifier, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "identifier", ErrorRecoverySet.ID) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Identifier : TokenID.Identifier
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3765,7 +3765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.NumberLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "numberLiteral", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.NumberLiteral : TokenID.NumberLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3815,7 +3815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.RegularExpressionLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "regex", ErrorRecoverySet.RegExp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.RegularExpressionLiteral : TokenID.RegularExpressionLiteral
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3865,7 +3865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.StringLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "qstring", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.StringLiteral : TokenID.StringLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3916,7 +3916,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Semicolon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ";", ErrorRecoverySet.SColon) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Semicolon : TokenID.Semicolon
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3966,7 +3966,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ")", ErrorRecoverySet.RParen) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseParen : TokenID.CloseParen
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4016,7 +4016,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "]", ErrorRecoverySet.RBrack) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseBracket : TokenID.CloseBracket
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4066,7 +4066,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "{", ErrorRecoverySet.LCurly) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenBrace : TokenID.OpenBrace
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4116,7 +4116,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "}", ErrorRecoverySet.RCurly) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseBrace : TokenID.CloseBrace
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4166,7 +4166,7 @@ module TypeScript {
 >setTokenInfo(TokenID.DotDotDot, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "...", ErrorRecoverySet.None) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.DotDotDot : TokenID.DotDotDot
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4217,7 +4217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Comma, Reservation.None, OperatorPrecedence.Comma, NodeType.Comma, OperatorPrecedence.None, NodeType.None, ",", ErrorRecoverySet.Comma) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Comma : TokenID.Comma
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4267,7 +4267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Equals, Reservation.None, OperatorPrecedence.Assignment, NodeType.Asg, OperatorPrecedence.None, NodeType.None, "=", ErrorRecoverySet.Asg) : void
 >                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Equals : TokenID.Equals
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4317,7 +4317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAdd, OperatorPrecedence.None, NodeType.None, "+=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PlusEquals : TokenID.PlusEquals
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4367,7 +4367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgSub, OperatorPrecedence.None, NodeType.None, "-=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.MinusEquals : TokenID.MinusEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4417,7 +4417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AsteriskEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMul, OperatorPrecedence.None, NodeType.None, "*=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AsteriskEquals : TokenID.AsteriskEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4467,7 +4467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.SlashEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgDiv, OperatorPrecedence.None, NodeType.None, "/=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.SlashEquals : TokenID.SlashEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4517,7 +4517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PercentEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMod, OperatorPrecedence.None, NodeType.None, "%=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PercentEquals : TokenID.PercentEquals
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4567,7 +4567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAnd, OperatorPrecedence.None, NodeType.None, "&=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AmpersandEquals : TokenID.AmpersandEquals
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4617,7 +4617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CaretEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgXor, OperatorPrecedence.None, NodeType.None, "^=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CaretEquals : TokenID.CaretEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4667,7 +4667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgOr, OperatorPrecedence.None, NodeType.None, "|=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.BarEquals : TokenID.BarEquals
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4717,7 +4717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgLsh, OperatorPrecedence.None, NodeType.None, "<<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanLessThanEquals : TokenID.LessThanLessThanEquals
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4767,7 +4767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRsh, OperatorPrecedence.None, NodeType.None, ">>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanEquals
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4817,7 +4817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRs2, OperatorPrecedence.None, NodeType.None, ">>>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanGreaterThanEquals
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4867,7 +4867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Question, Reservation.None, OperatorPrecedence.Conditional, NodeType.ConditionalExpression, OperatorPrecedence.None, NodeType.None, "?", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Question : TokenID.Question
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4917,7 +4917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Colon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ":", ErrorRecoverySet.Colon) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Colon : TokenID.Colon
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4967,7 +4967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarBar, Reservation.None, OperatorPrecedence.LogicalOr, NodeType.LogOr, OperatorPrecedence.None, NodeType.None, "||", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.BarBar : TokenID.BarBar
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5017,7 +5017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandAmpersand, Reservation.None, OperatorPrecedence.LogicalAnd, NodeType.LogAnd, OperatorPrecedence.None, NodeType.None, "&&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AmpersandAmpersand : TokenID.AmpersandAmpersand
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5067,7 +5067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bar, Reservation.None, OperatorPrecedence.BitwiseOr, NodeType.Or, OperatorPrecedence.None, NodeType.None, "|", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Bar : TokenID.Bar
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5117,7 +5117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Caret, Reservation.None, OperatorPrecedence.BitwiseExclusiveOr, NodeType.Xor, OperatorPrecedence.None, NodeType.None, "^", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Caret : TokenID.Caret
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5167,7 +5167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.And, Reservation.None, OperatorPrecedence.BitwiseAnd, NodeType.And, OperatorPrecedence.None, NodeType.None, "&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.And : TokenID.And
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5217,7 +5217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eq, OperatorPrecedence.None, NodeType.None, "==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsEquals : TokenID.EqualsEquals
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5267,7 +5267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Ne, OperatorPrecedence.None, NodeType.None, "!=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.ExclamationEquals : TokenID.ExclamationEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5317,7 +5317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eqv, OperatorPrecedence.None, NodeType.None, "===", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsEqualsEquals : TokenID.EqualsEqualsEquals
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5367,7 +5367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.NEqv, OperatorPrecedence.None, NodeType.None, "!==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.ExclamationEqualsEquals : TokenID.ExclamationEqualsEquals
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5417,7 +5417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Lt, OperatorPrecedence.None, NodeType.None, "<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThan : TokenID.LessThan
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5467,7 +5467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Le, OperatorPrecedence.None, NodeType.None, "<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanEquals : TokenID.LessThanEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5517,7 +5517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Gt, OperatorPrecedence.None, NodeType.None, ">", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThan : TokenID.GreaterThan
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5567,7 +5567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Ge, OperatorPrecedence.None, NodeType.None, ">=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanEquals : TokenID.GreaterThanEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5617,7 +5617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Lsh, OperatorPrecedence.None, NodeType.None, "<<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanLessThan : TokenID.LessThanLessThan
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5667,7 +5667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rsh, OperatorPrecedence.None, NodeType.None, ">>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThan : TokenID.GreaterThanGreaterThan
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5717,7 +5717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rs2, OperatorPrecedence.None, NodeType.None, ">>>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThan : TokenID.GreaterThanGreaterThanGreaterThan
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5767,7 +5767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Plus, Reservation.None, OperatorPrecedence.Additive, NodeType.Add, OperatorPrecedence.Unary, NodeType.Pos, "+", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Plus : TokenID.Plus
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5817,7 +5817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Minus, Reservation.None, OperatorPrecedence.Additive, NodeType.Sub, OperatorPrecedence.Unary, NodeType.Neg, "-", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Minus : TokenID.Minus
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5867,7 +5867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Asterisk, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mul, OperatorPrecedence.None, NodeType.None, "*", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Asterisk : TokenID.Asterisk
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5917,7 +5917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Slash, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Div, OperatorPrecedence.None, NodeType.None, "/", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Slash : TokenID.Slash
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5967,7 +5967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Percent, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mod, OperatorPrecedence.None, NodeType.None, "%", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Percent : TokenID.Percent
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6017,7 +6017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Tilde, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Not, "~", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Tilde : TokenID.Tilde
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6067,7 +6067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Exclamation, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.LogNot, "!", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Exclamation : TokenID.Exclamation
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6117,7 +6117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusPlus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.IncPre, "++", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PlusPlus : TokenID.PlusPlus
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6167,7 +6167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusMinus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.DecPre, "--", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.MinusMinus : TokenID.MinusMinus
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6217,7 +6217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "(", ErrorRecoverySet.LParen) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenParen : TokenID.OpenParen
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6267,7 +6267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "[", ErrorRecoverySet.LBrack) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenBracket : TokenID.OpenBracket
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6317,7 +6317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Dot, Reservation.None, OperatorPrecedence.Unary, NodeType.None, OperatorPrecedence.None, NodeType.None, ".", ErrorRecoverySet.Dot) : void
 >                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Dot : TokenID.Dot
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6367,7 +6367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EndOfFile, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "<EOF>", ErrorRecoverySet.EOF) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EndOfFile : TokenID.EndOfFile
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6417,7 +6417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsGreaterThan, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "=>", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsGreaterThan : TokenID.EqualsGreaterThan
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index d941bb4c4efe1..2eee22d1ed353 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -136,7 +136,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -336,7 +336,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -777,7 +777,7 @@ module TypeScript {
 
         public print(context: PrintContext) {
 >print : (context: PrintContext) => void
->      : ^       ^^            ^^^^^^^^^
+>      : ^       ^^^^^^^^^^^^^^^^^^^^^^^
 >context : PrintContext
 >        : ^^^^^^^^^^^^
 
@@ -1055,7 +1055,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1095,7 +1095,7 @@ module TypeScript {
 
         public netFreeUses(container: Symbol, freeUses: StringHashTable) {
 >netFreeUses : (container: Symbol, freeUses: StringHashTable) => void
->            : ^         ^^      ^^        ^^               ^^^^^^^^^
+>            : ^         ^^      ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 >freeUses : StringHashTable
@@ -1411,7 +1411,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1666,7 +1666,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -1725,7 +1725,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -1797,7 +1797,7 @@ module TypeScript {
 >this.members[i].typeCheck(typeFlow) : any
 >                                    : ^^^
 >this.members[i].typeCheck : (typeFlow: TypeFlow) => any
->                          : ^        ^^        ^^^^^^^^
+>                          : ^        ^^^^^^^^^^^^^^^^^^
 >this.members[i] : AST
 >                : ^^^
 >this.members : AST[]
@@ -1809,7 +1809,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
                 }
@@ -2018,7 +2018,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2037,7 +2037,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2062,7 +2062,7 @@ module TypeScript {
 
         public static fromToken(token: Token): Identifier {
 >fromToken : (token: Token) => Identifier
->          : ^     ^^     ^^^^^          
+>          : ^     ^^^^^^^^^^^^          
 >token : Token
 >      : ^^^^^
 
@@ -2119,7 +2119,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2174,7 +2174,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2201,7 +2201,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2390,7 +2390,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2398,11 +2398,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Expression
 >      : ^^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2437,7 +2437,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2992,7 +2992,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -3835,7 +3835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -3884,7 +3884,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -4035,7 +4035,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -4777,7 +4777,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5447,7 +5447,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5466,7 +5466,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5657,7 +5657,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5703,7 +5703,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5946,7 +5946,7 @@ module TypeScript {
         
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5973,7 +5973,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6082,7 +6082,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6161,7 +6161,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6286,7 +6286,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6571,7 +6571,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6864,7 +6864,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6988,7 +6988,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7111,7 +7111,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7728,7 +7728,7 @@ module TypeScript {
 
         public buildControlFlow(): ControlFlowContext {
 >buildControlFlow : () => ControlFlowContext
->                 : ^^^^^^                  
+>                 : ^^^^^^^^^^^^^^^^^^^^^^^^
 
             var entry = new BasicBlock();
 >entry : any
@@ -7760,9 +7760,9 @@ module TypeScript {
 
             var controlFlowPrefix = (ast: AST, parent: AST, walker: IAstWalker) => {
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >(ast: AST, parent: AST, walker: IAstWalker) => {                ast.addToControlFlow(walker.state);                return ast;            } : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7774,11 +7774,11 @@ module TypeScript {
 >ast.addToControlFlow(walker.state) : void
 >                                   : ^^^^
 >ast.addToControlFlow : (context: ControlFlowContext) => void
->                     : ^       ^^                  ^^^^^    
+>                     : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >ast : AST
 >    : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >walker.state : any
 >             : ^^^
 >walker : IAstWalker
@@ -7805,7 +7805,7 @@ module TypeScript {
 >getWalker : any
 >          : ^^^
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >context : any
 >        : ^^^
 
@@ -7846,7 +7846,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -7865,7 +7865,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -8540,7 +8540,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -8873,7 +8873,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9231,7 +9231,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9250,7 +9250,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9506,7 +9506,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9525,7 +9525,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9592,7 +9592,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9611,7 +9611,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9682,7 +9682,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9735,7 +9735,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9815,7 +9815,7 @@ module TypeScript {
 >this.labels.members[i].emit(emitter, tokenId, startLine) : void
 >                                                         : ^^^^
 >this.labels.members[i].emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->                            : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>                            : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >this.labels.members[i] : AST
 >                       : ^^^
 >this.labels.members : AST[]
@@ -9831,7 +9831,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9844,7 +9844,7 @@ module TypeScript {
 >this.stmt.emit(emitter, tokenId, true) : void
 >                                       : ^^^^
 >this.stmt.emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->               : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>               : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9852,7 +9852,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9889,7 +9889,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9921,7 +9921,7 @@ module TypeScript {
 >this.stmt.typeCheck(typeFlow) : any
 >                              : ^^^
 >this.stmt.typeCheck : (typeFlow: TypeFlow) => any
->                    : ^        ^^        ^^^^^^^^
+>                    : ^        ^^^^^^^^^^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9929,7 +9929,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9940,7 +9940,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10017,7 +10017,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10245,7 +10245,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10381,7 +10381,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -10524,7 +10524,7 @@ module TypeScript {
 
         public setResolvedTarget(parser: Parser, stmt: Statement): boolean {
 >setResolvedTarget : (parser: Parser, stmt: Statement) => boolean
->                  : ^      ^^      ^^    ^^         ^^^^^       
+>                  : ^      ^^^^^^^^^^    ^^         ^^^^^       
 >parser : Parser
 >       : ^^^^^^
 >stmt : Statement
@@ -10655,7 +10655,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10663,11 +10663,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10706,7 +10706,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10886,7 +10886,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11043,7 +11043,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11062,7 +11062,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11365,7 +11365,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11578,7 +11578,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11597,7 +11597,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11872,7 +11872,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12101,7 +12101,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -12120,7 +12120,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12128,7 +12128,7 @@ module TypeScript {
 >this.cond.addToControlFlow(context) : void
 >                                    : ^^^^
 >this.cond.addToControlFlow : (context: ControlFlowContext) => void
->                           : ^       ^^                  ^^^^^    
+>                           : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >this.cond : AST
 >          : ^^^
 >this : this
@@ -12136,7 +12136,7 @@ module TypeScript {
 >cond : AST
 >     : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12530,7 +12530,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12676,7 +12676,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12684,11 +12684,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12705,7 +12705,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13357,7 +13357,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -13582,7 +13582,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13652,7 +13652,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -13942,7 +13942,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14257,7 +14257,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14276,7 +14276,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -14779,7 +14779,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14919,7 +14919,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14984,7 +14984,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15299,7 +15299,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15451,7 +15451,7 @@ module TypeScript {
         // if there are break statements that match this switch, then just link cond block with block after switch
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -15730,7 +15730,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15882,7 +15882,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15951,7 +15951,7 @@ module TypeScript {
         // for now, assume all cases are reachable, regardless of whether some cases fall through
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16170,7 +16170,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16189,7 +16189,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16397,7 +16397,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16480,7 +16480,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16557,7 +16557,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16803,7 +16803,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16914,7 +16914,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17163,7 +17163,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17266,7 +17266,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17365,7 +17365,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17400,7 +17400,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17531,7 +17531,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17710,7 +17710,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17835,7 +17835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18288,7 +18288,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -18387,7 +18387,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -18452,7 +18452,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18687,7 +18687,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index 6763d907264ef..28627d5cc3cf2 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -13,7 +13,7 @@ module TypeScript {
     export interface IAstWalker {
         walk(ast: AST, parent: AST): AST;
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -136,7 +136,7 @@ module TypeScript {
 
         public walk(ast: AST, parent: AST): AST {
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -355,7 +355,7 @@ module TypeScript {
 
         public walk(ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): AST {
 >walk : (ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => AST
->     : ^   ^^   ^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^   
+>     : ^   ^^^^^^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^^^^
 >ast : AST
 >    : ^^^
 >pre : IAstWalkCallback
@@ -371,7 +371,7 @@ module TypeScript {
 >this.getWalker(pre, post, options, state).walk(ast, null) : AST
 >                                                          : ^^^
 >this.getWalker(pre, post, options, state).walk : (ast: AST, parent: AST) => AST
->                                               : ^   ^^   ^^      ^^   ^^^^^   
+>                                               : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >this.getWalker(pre, post, options, state) : IAstWalker
 >                                          : ^^^^^^^^^^
 >this.getWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
@@ -389,7 +389,7 @@ module TypeScript {
 >state : any
 >      : ^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
         }
@@ -481,7 +481,7 @@ module TypeScript {
 
             this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.None] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -497,15 +497,15 @@ module TypeScript {
 >None : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Empty] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -521,15 +521,15 @@ module TypeScript {
 >Empty : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EmptyExpr] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -545,15 +545,15 @@ module TypeScript {
 >EmptyExpr : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.True] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -569,15 +569,15 @@ module TypeScript {
 >True : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.False] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -593,15 +593,15 @@ module TypeScript {
 >False : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.This] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -617,15 +617,15 @@ module TypeScript {
 >This : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Super] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -641,15 +641,15 @@ module TypeScript {
 >Super : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.QString] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -665,15 +665,15 @@ module TypeScript {
 >QString : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Regex] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -689,15 +689,15 @@ module TypeScript {
 >Regex : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Null] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -713,15 +713,15 @@ module TypeScript {
 >Null : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArrayLit] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -737,15 +737,15 @@ module TypeScript {
 >ArrayLit : any
 >         : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                       : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                       : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ObjectLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -761,15 +761,15 @@ module TypeScript {
 >ObjectLit : any
 >          : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Void] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -785,15 +785,15 @@ module TypeScript {
 >Void : any
 >     : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comma] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -809,15 +809,15 @@ module TypeScript {
 >Comma : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Pos] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -833,15 +833,15 @@ module TypeScript {
 >Pos : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Neg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -857,15 +857,15 @@ module TypeScript {
 >Neg : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Delete] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -881,15 +881,15 @@ module TypeScript {
 >Delete : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Await] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -905,15 +905,15 @@ module TypeScript {
 >Await : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.In] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -929,15 +929,15 @@ module TypeScript {
 >In : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Dot] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -953,15 +953,15 @@ module TypeScript {
 >Dot : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.From] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -977,15 +977,15 @@ module TypeScript {
 >From : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Is] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1001,15 +1001,15 @@ module TypeScript {
 >Is : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InstOf] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1025,15 +1025,15 @@ module TypeScript {
 >InstOf : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Typeof] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1049,15 +1049,15 @@ module TypeScript {
 >Typeof : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NumberLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1073,15 +1073,15 @@ module TypeScript {
 >NumberLit : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Name] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1097,15 +1097,15 @@ module TypeScript {
 >Name : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren;
 >this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeRef] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1121,15 +1121,15 @@ module TypeScript {
 >TypeRef : any
 >        : ^^^
 >ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Index] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1145,15 +1145,15 @@ module TypeScript {
 >Index : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Call] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1169,15 +1169,15 @@ module TypeScript {
 >Call : any
 >     : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.New] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1193,15 +1193,15 @@ module TypeScript {
 >New : any
 >    : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Asg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1217,15 +1217,15 @@ module TypeScript {
 >Asg : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAdd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1241,15 +1241,15 @@ module TypeScript {
 >AsgAdd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgSub] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1265,15 +1265,15 @@ module TypeScript {
 >AsgSub : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgDiv] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1289,15 +1289,15 @@ module TypeScript {
 >AsgDiv : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMul] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1313,15 +1313,15 @@ module TypeScript {
 >AsgMul : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMod] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1337,15 +1337,15 @@ module TypeScript {
 >AsgMod : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1361,15 +1361,15 @@ module TypeScript {
 >AsgAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgXor] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1385,15 +1385,15 @@ module TypeScript {
 >AsgXor : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1409,15 +1409,15 @@ module TypeScript {
 >AsgOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgLsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1433,15 +1433,15 @@ module TypeScript {
 >AsgLsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1457,15 +1457,15 @@ module TypeScript {
 >AsgRsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRs2] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1481,15 +1481,15 @@ module TypeScript {
 >AsgRs2 : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren;
 >this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                                                                                     : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ConditionalExpression] : IAstWalkChildren
 >                                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1505,15 +1505,15 @@ module TypeScript {
 >ConditionalExpression : any
 >                      : ^^^
 >ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1529,15 +1529,15 @@ module TypeScript {
 >LogOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1553,15 +1553,15 @@ module TypeScript {
 >LogAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Or] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1577,15 +1577,15 @@ module TypeScript {
 >Or : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Xor] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1601,15 +1601,15 @@ module TypeScript {
 >Xor : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.And] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1625,15 +1625,15 @@ module TypeScript {
 >And : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eq] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1649,15 +1649,15 @@ module TypeScript {
 >Eq : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ne] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1673,15 +1673,15 @@ module TypeScript {
 >Ne : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eqv] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1697,15 +1697,15 @@ module TypeScript {
 >Eqv : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NEqv] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1721,15 +1721,15 @@ module TypeScript {
 >NEqv : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1745,15 +1745,15 @@ module TypeScript {
 >Lt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Le] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1769,15 +1769,15 @@ module TypeScript {
 >Le : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Gt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1793,15 +1793,15 @@ module TypeScript {
 >Gt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ge] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1817,15 +1817,15 @@ module TypeScript {
 >Ge : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Add] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1841,15 +1841,15 @@ module TypeScript {
 >Add : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Sub] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1865,15 +1865,15 @@ module TypeScript {
 >Sub : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mul] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1889,15 +1889,15 @@ module TypeScript {
 >Mul : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Div] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1913,15 +1913,15 @@ module TypeScript {
 >Div : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mod] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1937,15 +1937,15 @@ module TypeScript {
 >Mod : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1961,15 +1961,15 @@ module TypeScript {
 >Lsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1985,15 +1985,15 @@ module TypeScript {
 >Rsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rs2] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2009,15 +2009,15 @@ module TypeScript {
 >Rs2 : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Not] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2033,15 +2033,15 @@ module TypeScript {
 >Not : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogNot] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2057,15 +2057,15 @@ module TypeScript {
 >LogNot : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2081,15 +2081,15 @@ module TypeScript {
 >IncPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2105,15 +2105,15 @@ module TypeScript {
 >DecPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2129,15 +2129,15 @@ module TypeScript {
 >IncPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2153,15 +2153,15 @@ module TypeScript {
 >DecPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeAssertion] : IAstWalkChildren
 >                                             : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2177,15 +2177,15 @@ module TypeScript {
 >TypeAssertion : any
 >              : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren;
 >this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.FuncDecl] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2201,15 +2201,15 @@ module TypeScript {
 >FuncDecl : any
 >         : ^^^
 >ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Member] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2225,15 +2225,15 @@ module TypeScript {
 >Member : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.VarDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2249,15 +2249,15 @@ module TypeScript {
 >VarDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArgDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2273,15 +2273,15 @@ module TypeScript {
 >ArgDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren;
 >this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Return] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2297,15 +2297,15 @@ module TypeScript {
 >Return : any
 >       : ^^^
 >ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Break] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2321,15 +2321,15 @@ module TypeScript {
 >Break : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Continue] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2345,15 +2345,15 @@ module TypeScript {
 >Continue : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Throw] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2369,15 +2369,15 @@ module TypeScript {
 >Throw : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren;
 >this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                                                              : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                              : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.For] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2393,15 +2393,15 @@ module TypeScript {
 >For : any
 >    : ^^^
 >ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren;
 >this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ForIn] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2417,15 +2417,15 @@ module TypeScript {
 >ForIn : any
 >      : ^^^
 >ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren;
 >this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                                                            : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                            : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.If] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2441,15 +2441,15 @@ module TypeScript {
 >If : any
 >   : ^^^
 >ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren;
 >this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.While] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2465,15 +2465,15 @@ module TypeScript {
 >While : any
 >      : ^^^
 >ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren;
 >this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DoWhile] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2489,15 +2489,15 @@ module TypeScript {
 >DoWhile : any
 >        : ^^^
 >ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren;
 >this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Block] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2513,15 +2513,15 @@ module TypeScript {
 >Block : any
 >      : ^^^
 >ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren;
 >this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Case] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2537,15 +2537,15 @@ module TypeScript {
 >Case : any
 >     : ^^^
 >ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren;
 >this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Switch] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2561,15 +2561,15 @@ module TypeScript {
 >Switch : any
 >       : ^^^
 >ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren;
 >this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                                                     : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                     : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Try] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2585,15 +2585,15 @@ module TypeScript {
 >Try : any
 >    : ^^^
 >ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren;
 >this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryCatch] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2609,15 +2609,15 @@ module TypeScript {
 >TryCatch : any
 >         : ^^^
 >ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren;
 >this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryFinally] : IAstWalkChildren
 >                                          : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2633,15 +2633,15 @@ module TypeScript {
 >TryFinally : any
 >           : ^^^
 >ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren;
 >this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                                                             : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                             : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Finally] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2657,15 +2657,15 @@ module TypeScript {
 >Finally : any
 >        : ^^^
 >ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren;
 >this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Catch] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2681,15 +2681,15 @@ module TypeScript {
 >Catch : any
 >      : ^^^
 >ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren;
 >this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                       : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                       : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.List] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2705,15 +2705,15 @@ module TypeScript {
 >List : any
 >     : ^^^
 >ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren;
 >this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                                                           : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                           : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Script] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2729,15 +2729,15 @@ module TypeScript {
 >Script : any
 >       : ^^^
 >ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren;
 >this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                        : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                        : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ClassDeclaration] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2753,15 +2753,15 @@ module TypeScript {
 >ClassDeclaration : any
 >                 : ^^^
 >ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren;
 >this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InterfaceDeclaration] : IAstWalkChildren
 >                                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2777,15 +2777,15 @@ module TypeScript {
 >InterfaceDeclaration : any
 >                     : ^^^
 >ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren;
 >this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ModuleDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2801,15 +2801,15 @@ module TypeScript {
 >ModuleDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren;
 >this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ImportDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2825,15 +2825,15 @@ module TypeScript {
 >ImportDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren;
 >this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.With] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2849,15 +2849,15 @@ module TypeScript {
 >With : any
 >     : ^^^
 >ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren;
 >this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Label] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2873,15 +2873,15 @@ module TypeScript {
 >Label : any
 >      : ^^^
 >ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren;
 >this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                                                                               : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                               : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LabeledStatement] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2897,15 +2897,15 @@ module TypeScript {
 >LabeledStatement : any
 >                 : ^^^
 >ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EBStart] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2921,15 +2921,15 @@ module TypeScript {
 >EBStart : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.GotoEB] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2945,15 +2945,15 @@ module TypeScript {
 >GotoEB : any
 >       : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EndCode] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2969,15 +2969,15 @@ module TypeScript {
 >EndCode : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Error] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2993,15 +2993,15 @@ module TypeScript {
 >Error : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comment] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3017,15 +3017,15 @@ module TypeScript {
 >Comment : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Debugger] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3041,11 +3041,11 @@ module TypeScript {
 >Debugger : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             // Verify the code is up to date with the enum
             for (var e in (<any>NodeType)._map) {
@@ -3129,7 +3129,7 @@ module TypeScript {
 
         export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3142,7 +3142,7 @@ module TypeScript {
 
         export function walkListChildren(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3224,11 +3224,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3289,11 +3289,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3313,7 +3313,7 @@ module TypeScript {
 
         export function walkUnaryExpressionChildren(preAst: UnaryExpression, parent: AST, walker: IAstWalker): void {
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : UnaryExpression
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -3341,11 +3341,11 @@ module TypeScript {
 >walker.walk(preAst.castTerm, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.castTerm : any
 >                : ^^^
 >preAst : UnaryExpression
@@ -3375,11 +3375,11 @@ module TypeScript {
 >walker.walk(preAst.operand, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand : any
 >               : ^^^
 >preAst : UnaryExpression
@@ -3393,7 +3393,7 @@ module TypeScript {
 
         export function walkBinaryExpressionChildren(preAst: BinaryExpression, parent: AST, walker: IAstWalker): void {
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : BinaryExpression
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3433,11 +3433,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3483,11 +3483,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3518,11 +3518,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3568,11 +3568,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3587,7 +3587,7 @@ module TypeScript {
 
         export function walkTypeReferenceChildren(preAst: TypeReference, parent: AST, walker: IAstWalker): void {
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeReference
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -3615,11 +3615,11 @@ module TypeScript {
 >walker.walk(preAst.term, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.term : any
 >            : ^^^
 >preAst : TypeReference
@@ -3633,7 +3633,7 @@ module TypeScript {
 
         export function walkCallExpressionChildren(preAst: CallExpression, parent: AST, walker: IAstWalker): void {
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : CallExpression
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -3667,11 +3667,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3717,11 +3717,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.arguments : any
 >                 : ^^^
 >preAst : CallExpression
@@ -3771,11 +3771,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3789,7 +3789,7 @@ module TypeScript {
 
         export function walkTrinaryExpressionChildren(preAst: ConditionalExpression, parent: AST, walker: IAstWalker): void {
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ConditionalExpression
 >       : ^^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3817,11 +3817,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3865,11 +3865,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3913,11 +3913,11 @@ module TypeScript {
 >walker.walk(preAst.operand3, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand3 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3931,7 +3931,7 @@ module TypeScript {
 
         export function walkFuncDeclChildren(preAst: FuncDecl, parent: AST, walker: IAstWalker): void {
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : FuncDecl
 >       : ^^^^^^^^
 >parent : AST
@@ -3961,11 +3961,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.name : any
 >            : ^^^
 >preAst : FuncDecl
@@ -4033,11 +4033,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.arguments : any
 >                 : ^^^
 >preAst : FuncDecl
@@ -4081,11 +4081,11 @@ module TypeScript {
 >walker.walk(preAst.returnTypeAnnotation, preAst) : AST
 >                                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.returnTypeAnnotation : any
 >                            : ^^^
 >preAst : FuncDecl
@@ -4153,11 +4153,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.bod : any
 >           : ^^^
 >preAst : FuncDecl
@@ -4171,7 +4171,7 @@ module TypeScript {
 
         export function walkBoundDeclChildren(preAst: BoundDecl, parent: AST, walker: IAstWalker): void {
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : BoundDecl
 >       : ^^^^^^^^^
 >parent : AST
@@ -4201,11 +4201,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.id : any
 >          : ^^^
 >preAst : BoundDecl
@@ -4235,11 +4235,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.init : any
 >            : ^^^
 >preAst : BoundDecl
@@ -4285,11 +4285,11 @@ module TypeScript {
 >walker.walk(preAst.typeExpr, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.typeExpr : any
 >                : ^^^
 >preAst : BoundDecl
@@ -4303,7 +4303,7 @@ module TypeScript {
 
         export function walkReturnStatementChildren(preAst: ReturnStatement, parent: AST, walker: IAstWalker): void {
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ReturnStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -4331,11 +4331,11 @@ module TypeScript {
 >walker.walk(preAst.returnExpression, preAst) : AST
 >                                             : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.returnExpression : any
 >                        : ^^^
 >preAst : ReturnStatement
@@ -4349,7 +4349,7 @@ module TypeScript {
 
         export function walkForStatementChildren(preAst: ForStatement, parent: AST, walker: IAstWalker): void {
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ForStatement
 >       : ^^^^^^^^^^^^
 >parent : AST
@@ -4377,11 +4377,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.init : any
 >            : ^^^
 >preAst : ForStatement
@@ -4424,11 +4424,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : ForStatement
@@ -4471,11 +4471,11 @@ module TypeScript {
 >walker.walk(preAst.incr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.incr : any
 >            : ^^^
 >preAst : ForStatement
@@ -4518,11 +4518,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : ForStatement
@@ -4536,7 +4536,7 @@ module TypeScript {
 
         export function walkForInStatementChildren(preAst: ForInStatement, parent: AST, walker: IAstWalker): void {
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ForInStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4556,11 +4556,11 @@ module TypeScript {
 >walker.walk(preAst.lval, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.lval : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4594,11 +4594,11 @@ module TypeScript {
 >walker.walk(preAst.obj, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.obj : any
 >           : ^^^
 >preAst : ForInStatement
@@ -4642,11 +4642,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4660,7 +4660,7 @@ module TypeScript {
 
         export function walkIfStatementChildren(preAst: IfStatement, parent: AST, walker: IAstWalker): void {
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : IfStatement
 >       : ^^^^^^^^^^^
 >parent : AST
@@ -4680,11 +4680,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : IfStatement
@@ -4728,11 +4728,11 @@ module TypeScript {
 >walker.walk(preAst.thenBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.thenBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4776,11 +4776,11 @@ module TypeScript {
 >walker.walk(preAst.elseBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.elseBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4794,7 +4794,7 @@ module TypeScript {
 
         export function walkWhileStatementChildren(preAst: WhileStatement, parent: AST, walker: IAstWalker): void {
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : WhileStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4814,11 +4814,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4862,11 +4862,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4880,7 +4880,7 @@ module TypeScript {
 
         export function walkDoWhileStatementChildren(preAst: DoWhileStatement, parent: AST, walker: IAstWalker): void {
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : DoWhileStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -4900,11 +4900,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4948,11 +4948,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4966,7 +4966,7 @@ module TypeScript {
 
         export function walkBlockChildren(preAst: Block, parent: AST, walker: IAstWalker): void {
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Block
 >       : ^^^^^
 >parent : AST
@@ -4996,11 +4996,11 @@ module TypeScript {
 >walker.walk(preAst.statements, preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.statements : any
 >                  : ^^^
 >preAst : Block
@@ -5014,7 +5014,7 @@ module TypeScript {
 
         export function walkCaseStatementChildren(preAst: CaseStatement, parent: AST, walker: IAstWalker): void {
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : CaseStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -5042,11 +5042,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.expr : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5091,11 +5091,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5109,7 +5109,7 @@ module TypeScript {
 
         export function walkSwitchStatementChildren(preAst: SwitchStatement, parent: AST, walker: IAstWalker): void {
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : SwitchStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5137,11 +5137,11 @@ module TypeScript {
 >walker.walk(preAst.val, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.val : any
 >           : ^^^
 >preAst : SwitchStatement
@@ -5188,11 +5188,11 @@ module TypeScript {
 >walker.walk(preAst.caseList, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.caseList : any
 >                : ^^^
 >preAst : SwitchStatement
@@ -5206,7 +5206,7 @@ module TypeScript {
 
         export function walkTryChildren(preAst: Try, parent: AST, walker: IAstWalker): void {
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Try
 >       : ^^^
 >parent : AST
@@ -5234,11 +5234,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Try
@@ -5252,7 +5252,7 @@ module TypeScript {
 
         export function walkTryCatchChildren(preAst: TryCatch, parent: AST, walker: IAstWalker): void {
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TryCatch
 >       : ^^^^^^^^
 >parent : AST
@@ -5282,11 +5282,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryCatch
@@ -5333,11 +5333,11 @@ module TypeScript {
 >walker.walk(preAst.catchNode, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.catchNode : any
 >                 : ^^^
 >preAst : TryCatch
@@ -5351,7 +5351,7 @@ module TypeScript {
 
         export function walkTryFinallyChildren(preAst: TryFinally, parent: AST, walker: IAstWalker): void {
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TryFinally
 >       : ^^^^^^^^^^
 >parent : AST
@@ -5379,11 +5379,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryFinally
@@ -5428,11 +5428,11 @@ module TypeScript {
 >walker.walk(preAst.finallyNode, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.finallyNode : any
 >                   : ^^^
 >preAst : TryFinally
@@ -5446,7 +5446,7 @@ module TypeScript {
 
         export function walkFinallyChildren(preAst: Finally, parent: AST, walker: IAstWalker): void {
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Finally
 >       : ^^^^^^^
 >parent : AST
@@ -5474,11 +5474,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Finally
@@ -5492,7 +5492,7 @@ module TypeScript {
 
         export function walkCatchChildren(preAst: Catch, parent: AST, walker: IAstWalker): void {
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Catch
 >       : ^^^^^
 >parent : AST
@@ -5522,11 +5522,11 @@ module TypeScript {
 >walker.walk(preAst.param, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.param : any
 >             : ^^^
 >preAst : Catch
@@ -5571,11 +5571,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Catch
@@ -5589,7 +5589,7 @@ module TypeScript {
 
         export function walkRecordChildren(preAst: NamedDeclaration, parent: AST, walker: IAstWalker): void {
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : NamedDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5611,11 +5611,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.name : any
 >            : ^^^
 >preAst : NamedDeclaration
@@ -5659,11 +5659,11 @@ module TypeScript {
 >walker.walk(preAst.members, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members : any
 >               : ^^^
 >preAst : NamedDeclaration
@@ -5678,7 +5678,7 @@ module TypeScript {
 
         export function walkNamedTypeChildren(preAst: TypeDeclaration, parent: AST, walker: IAstWalker): void {
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5690,7 +5690,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5701,7 +5701,7 @@ module TypeScript {
 
         export function walkClassDeclChildren(preAst: ClassDeclaration, parent: AST, walker: IAstWalker): void {
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5713,7 +5713,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5755,11 +5755,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : ClassDeclaration
@@ -5804,11 +5804,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : ClassDeclaration
@@ -5822,7 +5822,7 @@ module TypeScript {
 
         export function walkScriptChildren(preAst: Script, parent: AST, walker: IAstWalker): void {
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Script
 >       : ^^^^^^
 >parent : AST
@@ -5852,11 +5852,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.bod : any
 >           : ^^^
 >preAst : Script
@@ -5870,7 +5870,7 @@ module TypeScript {
 
         export function walkTypeDeclChildren(preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker): void {
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5882,7 +5882,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5925,11 +5925,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : InterfaceDeclaration
@@ -5974,11 +5974,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : InterfaceDeclaration
@@ -5992,7 +5992,7 @@ module TypeScript {
 
         export function walkModuleDeclChildren(preAst: ModuleDeclaration, parent: AST, walker: IAstWalker): void {
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6004,7 +6004,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6015,7 +6015,7 @@ module TypeScript {
 
         export function walkImportDeclChildren(preAst: ImportDeclaration, parent: AST, walker: IAstWalker): void {
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ImportDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6045,11 +6045,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.id : any
 >          : ^^^
 >preAst : ImportDeclaration
@@ -6079,11 +6079,11 @@ module TypeScript {
 >walker.walk(preAst.alias, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.alias : any
 >             : ^^^
 >preAst : ImportDeclaration
@@ -6097,7 +6097,7 @@ module TypeScript {
 
         export function walkWithStatementChildren(preAst: WithStatement, parent: AST, walker: IAstWalker): void {
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : WithStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -6125,11 +6125,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.expr : any
 >            : ^^^
 >preAst : WithStatement
@@ -6172,11 +6172,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : WithStatement
@@ -6190,7 +6190,7 @@ module TypeScript {
 
         export function walkLabelChildren(preAst: Label, parent: AST, walker: IAstWalker): void {
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Label
 >       : ^^^^^
 >parent : AST
@@ -6203,7 +6203,7 @@ module TypeScript {
 
         export function walkLabeledStatementChildren(preAst: LabeledStatement, parent: AST, walker: IAstWalker): void {
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : LabeledStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6225,11 +6225,11 @@ module TypeScript {
 >walker.walk(preAst.labels, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.labels : any
 >              : ^^^
 >preAst : LabeledStatement
@@ -6263,11 +6263,11 @@ module TypeScript {
 >walker.walk(preAst.stmt, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.stmt : any
 >            : ^^^
 >preAst : LabeledStatement
diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types
index 90f4660a711ff..a67ca5abfadf0 100644
--- a/tests/baselines/reference/parserRealSource13.types
+++ b/tests/baselines/reference/parserRealSource13.types
@@ -15,7 +15,7 @@ module TypeScript.AstWalkerWithDetailCallback {
     export interface AstWalkerDetailCallback {
         EmptyCallback? (pre, ast: AST): boolean;
 >EmptyCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -23,7 +23,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EmptyExprCallback? (pre, ast: AST): boolean;
 >EmptyExprCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -31,7 +31,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TrueCallback? (pre, ast: AST): boolean;
 >TrueCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -39,7 +39,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FalseCallback? (pre, ast: AST): boolean;
 >FalseCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -47,7 +47,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThisCallback? (pre, ast: AST): boolean;
 >ThisCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -55,7 +55,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SuperCallback? (pre, ast: AST): boolean;
 >SuperCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -63,7 +63,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QStringCallback? (pre, ast: AST): boolean;
 >QStringCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -71,7 +71,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RegexCallback? (pre, ast: AST): boolean;
 >RegexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -79,7 +79,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NullCallback? (pre, ast: AST): boolean;
 >NullCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -87,7 +87,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArrayLitCallback? (pre, ast: AST): boolean;
 >ArrayLitCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -95,7 +95,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ObjectLitCallback? (pre, ast: AST): boolean;
 >ObjectLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -103,7 +103,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VoidCallback? (pre, ast: AST): boolean;
 >VoidCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -111,7 +111,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommaCallback? (pre, ast: AST): boolean;
 >CommaCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -119,7 +119,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         PosCallback? (pre, ast: AST): boolean;
 >PosCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -127,7 +127,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NegCallback? (pre, ast: AST): boolean;
 >NegCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -135,7 +135,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DeleteCallback? (pre, ast: AST): boolean;
 >DeleteCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -143,7 +143,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AwaitCallback? (pre, ast: AST): boolean;
 >AwaitCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -151,7 +151,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InCallback? (pre, ast: AST): boolean;
 >InCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -159,7 +159,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DotCallback? (pre, ast: AST): boolean;
 >DotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -167,7 +167,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FromCallback? (pre, ast: AST): boolean;
 >FromCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -175,7 +175,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IsCallback? (pre, ast: AST): boolean;
 >IsCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -183,7 +183,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InstOfCallback? (pre, ast: AST): boolean;
 >InstOfCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -191,7 +191,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeofCallback? (pre, ast: AST): boolean;
 >TypeofCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -199,7 +199,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NumberLitCallback? (pre, ast: AST): boolean;
 >NumberLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -207,7 +207,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NameCallback? (pre, identifierAst: Identifier): boolean;
 >NameCallback : (pre: any, identifierAst: Identifier) => boolean
->             : ^   ^^^^^^^             ^^          ^^^^^       
+>             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >identifierAst : Identifier
@@ -215,7 +215,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeRefCallback? (pre, ast: AST): boolean;
 >TypeRefCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -223,7 +223,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IndexCallback? (pre, ast: AST): boolean;
 >IndexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -231,7 +231,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CallCallback? (pre, ast: AST): boolean;
 >CallCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -239,7 +239,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NewCallback? (pre, ast: AST): boolean;
 >NewCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -247,7 +247,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgCallback? (pre, ast: AST): boolean;
 >AsgCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -255,7 +255,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAddCallback? (pre, ast: AST): boolean;
 >AsgAddCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -263,7 +263,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgSubCallback? (pre, ast: AST): boolean;
 >AsgSubCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -271,7 +271,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgDivCallback? (pre, ast: AST): boolean;
 >AsgDivCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -279,7 +279,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgMulCallback? (pre, ast: AST): boolean;
 >AsgMulCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -287,7 +287,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgModCallback? (pre, ast: AST): boolean;
 >AsgModCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -295,7 +295,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAndCallback? (pre, ast: AST): boolean;
 >AsgAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -303,7 +303,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgXorCallback? (pre, ast: AST): boolean;
 >AsgXorCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -311,7 +311,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgOrCallback? (pre, ast: AST): boolean;
 >AsgOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -319,7 +319,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgLshCallback? (pre, ast: AST): boolean;
 >AsgLshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -327,7 +327,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRshCallback? (pre, ast: AST): boolean;
 >AsgRshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -335,7 +335,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRs2Callback? (pre, ast: AST): boolean;
 >AsgRs2Callback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -343,7 +343,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QMarkCallback? (pre, ast: AST): boolean;
 >QMarkCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -351,7 +351,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogOrCallback? (pre, ast: AST): boolean;
 >LogOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -359,7 +359,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogAndCallback? (pre, ast: AST): boolean;
 >LogAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -367,7 +367,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         OrCallback? (pre, ast: AST): boolean;
 >OrCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -375,7 +375,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         XorCallback? (pre, ast: AST): boolean;
 >XorCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -383,7 +383,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AndCallback? (pre, ast: AST): boolean;
 >AndCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -391,7 +391,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqCallback? (pre, ast: AST): boolean;
 >EqCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -399,7 +399,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NeCallback? (pre, ast: AST): boolean;
 >NeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -407,7 +407,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqvCallback? (pre, ast: AST): boolean;
 >EqvCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -415,7 +415,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NEqvCallback? (pre, ast: AST): boolean;
 >NEqvCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -423,7 +423,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LtCallback? (pre, ast: AST): boolean;
 >LtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -431,7 +431,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LeCallback? (pre, ast: AST): boolean;
 >LeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -439,7 +439,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GtCallback? (pre, ast: AST): boolean;
 >GtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -447,7 +447,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GeCallback? (pre, ast: AST): boolean;
 >GeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -455,7 +455,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AddCallback? (pre, ast: AST): boolean;
 >AddCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -463,7 +463,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SubCallback? (pre, ast: AST): boolean;
 >SubCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -471,7 +471,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MulCallback? (pre, ast: AST): boolean;
 >MulCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -479,7 +479,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DivCallback? (pre, ast: AST): boolean;
 >DivCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -487,7 +487,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModCallback? (pre, ast: AST): boolean;
 >ModCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -495,7 +495,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LshCallback? (pre, ast: AST): boolean;
 >LshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -503,7 +503,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RshCallback? (pre, ast: AST): boolean;
 >RshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -511,7 +511,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         Rs2Callback? (pre, ast: AST): boolean;
 >Rs2Callback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -519,7 +519,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NotCallback? (pre, ast: AST): boolean;
 >NotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -527,7 +527,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogNotCallback? (pre, ast: AST): boolean;
 >LogNotCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -535,7 +535,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPreCallback? (pre, ast: AST): boolean;
 >IncPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -543,7 +543,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPreCallback? (pre, ast: AST): boolean;
 >DecPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -551,7 +551,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPostCallback? (pre, ast: AST): boolean;
 >IncPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -559,7 +559,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPostCallback? (pre, ast: AST): boolean;
 >DecPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -567,7 +567,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeAssertionCallback? (pre, ast: AST): boolean;
 >TypeAssertionCallback : (pre: any, ast: AST) => boolean
->                      : ^   ^^^^^^^   ^^   ^^^^^       
+>                      : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -575,7 +575,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FuncDeclCallback? (pre, funcDecl: FuncDecl): boolean;
 >FuncDeclCallback : (pre: any, funcDecl: FuncDecl) => boolean
->                 : ^   ^^^^^^^        ^^        ^^^^^       
+>                 : ^   ^^^^^^^        ^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >funcDecl : FuncDecl
@@ -583,7 +583,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MemberCallback? (pre, ast: AST): boolean;
 >MemberCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -591,7 +591,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VarDeclCallback? (pre, varDecl: VarDecl): boolean;
 >VarDeclCallback : (pre: any, varDecl: VarDecl) => boolean
->                : ^   ^^^^^^^       ^^       ^^^^^       
+>                : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >varDecl : VarDecl
@@ -599,7 +599,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArgDeclCallback? (pre, ast: AST): boolean;
 >ArgDeclCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -607,7 +607,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ReturnCallback? (pre, ast: AST): boolean;
 >ReturnCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -615,7 +615,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BreakCallback? (pre, ast: AST): boolean;
 >BreakCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -623,7 +623,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ContinueCallback? (pre, ast: AST): boolean;
 >ContinueCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -631,7 +631,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThrowCallback? (pre, ast: AST): boolean;
 >ThrowCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -639,7 +639,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForCallback? (pre, ast: AST): boolean;
 >ForCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -647,7 +647,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForInCallback? (pre, ast: AST): boolean;
 >ForInCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -655,7 +655,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IfCallback? (pre, ast: AST): boolean;
 >IfCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -663,7 +663,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WhileCallback? (pre, ast: AST): boolean;
 >WhileCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -671,7 +671,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DoWhileCallback? (pre, ast: AST): boolean;
 >DoWhileCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -679,7 +679,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BlockCallback? (pre, block: Block): boolean;
 >BlockCallback : (pre: any, block: Block) => boolean
->              : ^   ^^^^^^^     ^^     ^^^^^       
+>              : ^   ^^^^^^^     ^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >block : Block
@@ -687,7 +687,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CaseCallback? (pre, ast: AST): boolean;
 >CaseCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -695,7 +695,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SwitchCallback? (pre, ast: AST): boolean;
 >SwitchCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -703,7 +703,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCallback? (pre, ast: AST): boolean;
 >TryCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -711,7 +711,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCatchCallback? (pre, ast: AST): boolean;
 >TryCatchCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -719,7 +719,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryFinallyCallback? (pre, ast: AST): boolean;
 >TryFinallyCallback : (pre: any, ast: AST) => boolean
->                   : ^   ^^^^^^^   ^^   ^^^^^       
+>                   : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -727,7 +727,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FinallyCallback? (pre, ast: AST): boolean;
 >FinallyCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -735,7 +735,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CatchCallback? (pre, ast: AST): boolean;
 >CatchCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -743,7 +743,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ListCallback? (pre, astList: ASTList): boolean;
 >ListCallback : (pre: any, astList: ASTList) => boolean
->             : ^   ^^^^^^^       ^^       ^^^^^       
+>             : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >astList : ASTList
@@ -751,7 +751,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ScriptCallback? (pre, script: Script): boolean;
 >ScriptCallback : (pre: any, script: Script) => boolean
->               : ^   ^^^^^^^      ^^      ^^^^^       
+>               : ^   ^^^^^^^      ^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >script : Script
@@ -759,7 +759,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ClassDeclarationCallback? (pre, ast: AST): boolean;
 >ClassDeclarationCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -767,7 +767,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InterfaceDeclarationCallback? (pre, interfaceDecl: InterfaceDeclaration): boolean;
 >InterfaceDeclarationCallback : (pre: any, interfaceDecl: InterfaceDeclaration) => boolean
->                             : ^   ^^^^^^^             ^^                    ^^^^^       
+>                             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >interfaceDecl : InterfaceDeclaration
@@ -775,7 +775,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModuleDeclarationCallback? (pre, moduleDecl: ModuleDeclaration): boolean;
 >ModuleDeclarationCallback : (pre: any, moduleDecl: ModuleDeclaration) => boolean
->                          : ^   ^^^^^^^          ^^                 ^^^^^       
+>                          : ^   ^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >moduleDecl : ModuleDeclaration
@@ -783,7 +783,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ImportDeclarationCallback? (pre, ast: AST): boolean;
 >ImportDeclarationCallback : (pre: any, ast: AST) => boolean
->                          : ^   ^^^^^^^   ^^   ^^^^^       
+>                          : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -791,7 +791,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WithCallback? (pre, ast: AST): boolean;
 >WithCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -799,7 +799,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabelCallback? (pre, labelAST: AST): boolean;
 >LabelCallback : (pre: any, labelAST: AST) => boolean
->              : ^   ^^^^^^^        ^^   ^^^^^       
+>              : ^   ^^^^^^^        ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >labelAST : AST
@@ -807,7 +807,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabeledStatementCallback? (pre, ast: AST): boolean;
 >LabeledStatementCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -815,7 +815,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EBStartCallback? (pre, ast: AST): boolean;
 >EBStartCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -823,7 +823,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GotoEBCallback? (pre, ast: AST): boolean;
 >GotoEBCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -831,7 +831,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EndCodeCallback? (pre, ast: AST): boolean;
 >EndCodeCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -839,7 +839,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ErrorCallback? (pre, ast: AST): boolean;
 >ErrorCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -847,7 +847,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommentCallback? (pre, ast: AST): boolean;
 >CommentCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -855,7 +855,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DebuggerCallback? (pre, ast: AST): boolean;
 >DebuggerCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -863,7 +863,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DefaultCallback? (pre, ast: AST): boolean;
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -872,7 +872,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     export function walk(script: Script, callback: AstWalkerDetailCallback): void {
 >walk : (script: Script, callback: AstWalkerDetailCallback) => void
->     : ^      ^^      ^^        ^^                       ^^^^^    
+>     : ^      ^^^^^^^^^^        ^^                       ^^^^^    
 >script : Script
 >       : ^^^^^^
 >callback : AstWalkerDetailCallback
@@ -880,9 +880,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var pre = (cur: AST, parent: AST) => {
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^   ^^      ^^   ^^^^^^^^
+>    : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >(cur: AST, parent: AST) => {            walker.options.goChildren = AstWalkerCallback(true, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^^^^^^^
+>                                                                                                                                            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -904,7 +904,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(true, cur, callback) : boolean
 >                                       : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >true : true
 >     : ^^^^
 >cur : AST
@@ -919,9 +919,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var post = (cur: AST, parent: AST) => {
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^^^^
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >(cur: AST, parent: AST) => {            AstWalkerCallback(false, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                 : ^   ^^   ^^      ^^   ^^^^^^^^
+>                                                                                                                 : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -931,7 +931,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(false, cur, callback) : boolean
 >                                        : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >false : false
 >      : ^^^^^
 >cur : AST
@@ -962,9 +962,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 >getWalker : any
 >          : ^^^
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^   ^^      ^^   ^^^^^^^^
+>    : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^^^^
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 
         walker.walk(script, null);
 >walker.walk(script, null) : any
@@ -981,7 +981,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     function AstWalkerCallback(pre: boolean, ast: AST, callback: AstWalkerDetailCallback): boolean {
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
@@ -1047,21 +1047,21 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         if (callback.DefaultCallback) {
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 
             return callback.DefaultCallback(pre, ast);
 >callback.DefaultCallback(pre, ast) : boolean
 >                                   : ^^^^^^^
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index 6619d911f4142..15987b2cc71ff 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -235,7 +235,7 @@ module TypeScript {
 
         public pop(): TypeScript.AST {
 >pop : () => TypeScript.AST
->    : ^^^^^^              
+>    : ^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 
@@ -304,7 +304,7 @@ module TypeScript {
 
         public push(ast: TypeScript.AST) {
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -469,7 +469,7 @@ module TypeScript {
 
         public nodeType(): TypeScript.NodeType {
 >nodeType : () => TypeScript.NodeType
->         : ^^^^^^                   
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 
@@ -623,7 +623,7 @@ module TypeScript {
 
         public get(index: number): TypeScript.AST {
 >get : (index: number) => TypeScript.AST
->    : ^     ^^      ^^^^^              
+>    : ^     ^^      ^^^^^^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
 >TypeScript : any
@@ -6838,7 +6838,7 @@ module TypeScript {
 
     export function isValidAstNode(ast: TypeScript.ASTSpan): boolean {
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >ast : TypeScript.ASTSpan
 >    : ^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6947,7 +6947,7 @@ module TypeScript {
     ///
     export function getAstPathToPosition(script: TypeScript.AST, pos: number, options = GetAstPathOptions.Default): TypeScript.AstPath {
 >getAstPathToPosition : (script: TypeScript.AST, pos: number, options?: GetAstPathOptions) => TypeScript.AstPath
->                     : ^      ^^              ^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
+>                     : ^      ^^^^^^^^^^^^^^^^^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7079,7 +7079,7 @@ module TypeScript {
 >ctx.path.push(comments[i]) : void
 >                           : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^              ^^^^^^^^^
+>              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7087,7 +7087,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >comments[i] : TypeScript.Comment
 >            : ^^^^^^^^^^^^^^^^^^
 >comments : TypeScript.Comment[]
@@ -7101,9 +7101,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {            if (isValidAstNode(cur)) {                // Add "cur" to the stack if it contains our position                // For "identifier" nodes, we need a special case: A position equal to "limChar" is                // valid, since the position corresponds to a caret position (in between characters)                // For example:                //  bar                //  0123                // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid                var inclusive =                    hasFlag(options, GetAstPathOptions.EdgeInclusive) ||                    cur.nodeType === TypeScript.NodeType.Name ||                    pos === script.limChar; // Special "EOF" case                var minChar = cur.minChar;                var limChar = cur.limChar + (inclusive ? 1 : 0)                if (pos >= minChar && pos < limChar) {                    // TODO: Since AST is sometimes not correct wrt to position, only add "cur" if it's better                    //       than top of the stack.                    var previous = ctx.path.ast();                    if (previous == null || (cur.minChar >= previous.minChar && cur.limChar <= previous.limChar)) {                        ctx.path.push(cur);                    }                    else {                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");                    }                }                // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually                if (pos < limChar) {                    lookInComments(cur.preComments);                }                if (pos >= minChar) {                    lookInComments(cur.postComments);                }                if (!hasFlag(options, GetAstPathOptions.DontPruneSearchBasedOnPosition)) {                    // Don't go further down the tree if pos is outside of [minChar, limChar]                    walker.options.goChildren = (minChar <= pos && pos <= limChar);                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7119,7 +7119,7 @@ module TypeScript {
 >isValidAstNode(cur) : boolean
 >                    : ^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7294,7 +7294,7 @@ module TypeScript {
 >ctx.path.push(cur) : void
 >                   : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^              ^^^^^^^^^
+>              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7302,7 +7302,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
                     }
@@ -7432,7 +7432,7 @@ module TypeScript {
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx : AstPathContext
 >    : ^^^^^^^^^^^^^^
 
@@ -7451,7 +7451,7 @@ module TypeScript {
     //
     export function getTokenizationOffset(script: TypeScript.Script, position: number): number {
 >getTokenizationOffset : (script: TypeScript.Script, position: number) => number
->                      : ^      ^^                 ^^        ^^      ^^^^^      
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^^        ^^      ^^^^^      
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7467,9 +7467,9 @@ module TypeScript {
 
         var pre = (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >(cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {            if (TypeScript.isValidAstNode(cur)) {                // Did we find a closer offset?                if (cur.minChar <= position) {                    bestOffset = max(bestOffset, cur.minChar);                }                // Stop the walk if this node is not related to "minChar"                if (cur.minChar > position || cur.limChar < bestOffset) {                    walker.options.goChildren = false;                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7489,11 +7489,11 @@ module TypeScript {
 >TypeScript.isValidAstNode(cur) : boolean
 >                               : ^^^^^^^
 >TypeScript.isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->                          : ^   ^^                  ^^^^^       
+>                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >TypeScript : typeof TypeScript
 >           : ^^^^^^^^^^^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7595,7 +7595,7 @@ module TypeScript {
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         return bestOffset;
 >bestOffset : number
@@ -7607,13 +7607,13 @@ module TypeScript {
     ///
     export function walkAST(ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void ): void {
 >walkAST : (ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void) => void
->        : ^   ^^              ^^        ^^                                                      ^^^^^    
+>        : ^   ^^^^^^^^^^^^^^^^^^        ^^                                                      ^^^^^    
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^                     ^^^^^    
+>         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7623,9 +7623,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.push(cur);            callback(path, walker);            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                              : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                              : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7655,11 +7655,11 @@ module TypeScript {
 >path.push(cur) : void
 >               : ^^^^
 >path.push : (ast: TypeScript.AST) => void
->          : ^   ^^              ^^^^^^^^^
+>          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7667,7 +7667,7 @@ module TypeScript {
 >callback(path, walker) : void
 >                       : ^^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^                     ^^^^^    
+>         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7679,9 +7679,9 @@ module TypeScript {
         }
         var post = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.pop();            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                       : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                       : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7711,11 +7711,11 @@ module TypeScript {
 >path.pop() : TypeScript.AST
 >           : ^^^^^^^^^^^^^^
 >path.pop : () => TypeScript.AST
->         : ^^^^^^              
+>         : ^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >pop : () => TypeScript.AST
->    : ^^^^^^              
+>    : ^^^^^^^^^^^^^^^^^^^^
 
             return cur;
 >cur : TypeScript.AST
@@ -7748,9 +7748,9 @@ module TypeScript {
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
     }
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 8f3ed1a4a4b1f..5705a96538950 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -285,7 +285,7 @@ module TypeScript {
 
     export function prePrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >prePrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>            : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -335,7 +335,7 @@ module TypeScript {
 
     export function postPrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >postPrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->             : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>             : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types
index 0ca3b7cf60791..19d355f02ffdc 100644
--- a/tests/baselines/reference/parserRealSource6.types
+++ b/tests/baselines/reference/parserRealSource6.types
@@ -66,11 +66,11 @@ module TypeScript {
 
         public scopeGetter: () => SymbolScope = null;
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 
         public objectLiteralScopeGetter: () => SymbolScope = null;
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
 
         public scopeStartAST: AST = null;
 >scopeStartAST : AST
@@ -133,32 +133,32 @@ module TypeScript {
 
         public getScope(): SymbolScope {
 >getScope : () => SymbolScope
->         : ^^^^^^           
+>         : ^^^^^^^^^^^^^^^^^
 
             return this.scopeGetter();
 >this.scopeGetter() : SymbolScope
 >                   : ^^^^^^^^^^^
 >this.scopeGetter : () => SymbolScope
->                 : ^^^^^^           
+>                 : ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
         }
 
         public getObjectLiteralScope(): SymbolScope {
 >getObjectLiteralScope : () => SymbolScope
->                      : ^^^^^^           
+>                      : ^^^^^^^^^^^^^^^^^
 
             return this.objectLiteralScopeGetter();
 >this.objectLiteralScopeGetter() : SymbolScope
 >                                : ^^^^^^^^^^^
 >this.objectLiteralScopeGetter : () => SymbolScope
->                              : ^^^^^^           
+>                              : ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
         }
 
         public getScopeAST() {
@@ -193,7 +193,7 @@ module TypeScript {
 
         public getScriptFragmentStartAST(): AST {
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 
             return this.scopeStartAST;
 >this.scopeStartAST : AST
@@ -214,18 +214,18 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^   
+>                               : ^^^^^^^^^
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 >minChar : any
 >        : ^^^
         }
 
         public getScriptFragment(): Script {
 >getScriptFragment : () => Script
->                  : ^^^^^^      
+>                  : ^^^^^^^^^^^^
 
             if (this.scriptFragment == null) {
 >this.scriptFragment == null : boolean
@@ -243,11 +243,11 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^   
+>                               : ^^^^^^^^^
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 
                 var minChar = ast.minChar;
 >minChar : any
@@ -341,7 +341,7 @@ module TypeScript {
 
     export function preFindMemberScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindMemberScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                   : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                   : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -508,7 +508,7 @@ module TypeScript {
 
     export function pushTypeCollectionScope(container: Symbol,
 >pushTypeCollectionScope : (container: Symbol, valueMembers: ScopedMembers, ambientValueMembers: ScopedMembers, enclosedTypes: ScopedMembers, ambientEnclosedTypes: ScopedMembers, context: TypeCollectionContext, thisType: Type, classType: Type, moduleDecl: ModuleDeclaration) => void
->                        : ^         ^^      ^^            ^^             ^^                   ^^             ^^             ^^             ^^                    ^^             ^^       ^^                     ^^        ^^    ^^         ^^    ^^          ^^                 ^^^^^^^^^
+>                        : ^         ^^      ^^            ^^^^^^^^^^^^^^^^^                   ^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^                    ^^^^^^^^^^^^^^^^^       ^^                     ^^        ^^^^^^^^         ^^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 
@@ -658,7 +658,7 @@ module TypeScript {
 
     export function preFindEnclosingScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -796,11 +796,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                         : ^^^^^^^^^
 
@@ -853,11 +853,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                     : ^^^^^^^^^
 
@@ -965,11 +965,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                                                    : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                              : ^^^^^^^^^
 
@@ -990,11 +990,11 @@ module TypeScript {
 >context.objectLiteralScopeGetter = function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                                                              : ^^^^^^^^^
 >context.objectLiteralScopeGetter : () => SymbolScope
->                                 : ^^^^^^           
+>                                 : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
 >function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                           : ^^^^^^^^^
 
@@ -1050,11 +1050,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                     : ^^^^^^^^^
 
@@ -1107,11 +1107,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                             : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                       : ^^^^^^^^^
 
@@ -1195,11 +1195,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         : ^^^^^^^^^
 
@@ -1371,7 +1371,7 @@ module TypeScript {
     //
     export function findEnclosingScopeAt(logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean): EnclosingScopeContext {
 >findEnclosingScopeAt : (logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean) => EnclosingScopeContext
->                     : ^      ^^       ^^      ^^      ^^    ^^           ^^   ^^      ^^                  ^^       ^^^^^                     
+>                     : ^      ^^^^^^^^^^^      ^^^^^^^^^^    ^^^^^^^^^^^^^^^   ^^      ^^                  ^^       ^^^^^                     
 >logger : ILogger
 >       : ^^^^^^^
 >script : Script
@@ -1419,7 +1419,7 @@ module TypeScript {
 >script : Script
 >       : ^^^^^^
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index 8b2d40b9c40ca..ac67b62fabd65 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -29,7 +29,7 @@ module TypeScript {
 
     function getBaseTypeLinks(bases: ASTList, baseTypeLinks: TypeLink[]) {
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >bases : ASTList
 >      : ^^^^^^^
 >baseTypeLinks : TypeLink[]
@@ -153,7 +153,7 @@ module TypeScript {
 
     function getBases(type: Type, typeDecl: TypeDeclaration) {
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : Type
 >     : ^^^^
 >typeDecl : TypeDeclaration
@@ -171,7 +171,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks) : TypeLink[]
 >                                                              : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.extendsList : any
 >                     : ^^^
 >typeDecl : TypeDeclaration
@@ -197,7 +197,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.implementsList, type.implementsTypeLinks) : TypeLink[]
 >                                                                    : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.implementsList : any
 >                        : ^^^
 >typeDecl : TypeDeclaration
@@ -214,7 +214,7 @@ module TypeScript {
 
     function addPrototypeField(classType: Type, ast: AST, context: TypeCollectionContext) {
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
+>                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >ast : AST
@@ -389,7 +389,7 @@ module TypeScript {
 
     export function createNewConstructGroupForType(type: Type) {
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >type : Type
 >     : ^^^^
 
@@ -480,7 +480,7 @@ module TypeScript {
 
     export function cloneParentConstructGroupForChildType(child: Type, parent: Type) {
 >cloneParentConstructGroupForChildType : (child: Type, parent: Type) => void
->                                      : ^     ^^    ^^      ^^    ^^^^^^^^^
+>                                      : ^     ^^^^^^^^      ^^^^^^^^^^^^^^^
 >child : Type
 >      : ^^^^
 >parent : Type
@@ -518,7 +518,7 @@ module TypeScript {
 >createNewConstructGroupForType(parent) : void
 >                                       : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >parent : Type
 >       : ^^^^
         }
@@ -748,7 +748,7 @@ module TypeScript {
 
     function findTypeSymbolInScopeChain(name: string, scopeChain: ScopeChain): Symbol {
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain : ScopeChain
@@ -798,7 +798,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, scopeChain.previous) : Symbol
 >                                                      : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain.previous : any
@@ -816,7 +816,7 @@ module TypeScript {
 
     function findSymbolFromAlias(alias: AST, context: IAliasScopeContext): Symbol {
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >alias : AST
 >      : ^^^
 >context : IAliasScopeContext
@@ -903,7 +903,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, context.topLevelScope) : Symbol
 >                                                        : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : any
 >     : ^^^
 >context.topLevelScope : ScopeChain
@@ -1001,7 +1001,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand1, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >dottedExpr.operand1 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1033,7 +1033,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand2, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >dottedExpr.operand2 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1110,7 +1110,7 @@ module TypeScript {
 
     export function preCollectImportTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -1171,7 +1171,7 @@ module TypeScript {
 >findSymbolFromAlias(importDecl.alias, { topLevelScope: scopeChain, members: null, tcContext: context }) : Symbol
 >                                                                                                        : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >importDecl.alias : any
 >                 : ^^^
 >importDecl : ImportDeclaration
@@ -1464,7 +1464,7 @@ module TypeScript {
 
     export function preCollectModuleTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -2586,7 +2586,7 @@ module TypeScript {
 
     export function preCollectClassTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3140,7 +3140,7 @@ module TypeScript {
 >addPrototypeField(classType, classDecl, context) : void
 >                                                 : ^^^^
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
+>                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >classDecl : ClassDeclaration
@@ -3806,7 +3806,7 @@ module TypeScript {
 >createNewConstructGroupForType(classDecl.type) : void
 >                                               : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >classDecl.type : any
 >               : ^^^
 >classDecl : ClassDeclaration
@@ -3851,7 +3851,7 @@ module TypeScript {
 >getBases(instanceType, classDecl) : void
 >                                  : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >instanceType : Type
 >             : ^^^^
 >classDecl : ClassDeclaration
@@ -3892,7 +3892,7 @@ module TypeScript {
 
     export function preCollectInterfaceTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4244,7 +4244,7 @@ module TypeScript {
 >getBases(interfaceType, interfaceDecl) : void
 >                                       : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >interfaceType : Type
 >              : ^^^^
 >interfaceDecl : InterfaceDeclaration
@@ -4393,7 +4393,7 @@ module TypeScript {
 
     export function preCollectArgDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4696,7 +4696,7 @@ module TypeScript {
 
     export function preCollectVarDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -5568,7 +5568,7 @@ module TypeScript {
 
     export function preCollectFuncDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7455,7 +7455,7 @@ module TypeScript {
 
     export function preCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >preCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7581,7 +7581,7 @@ module TypeScript {
 >preCollectImportTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7637,7 +7637,7 @@ module TypeScript {
 >preCollectModuleTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7669,7 +7669,7 @@ module TypeScript {
 >preCollectClassTypes(ast, parent, context) : boolean
 >                                           : ^^^^^^^
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7725,7 +7725,7 @@ module TypeScript {
 >preCollectInterfaceTypes(ast, parent, context) : boolean
 >                                               : ^^^^^^^
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7759,7 +7759,7 @@ module TypeScript {
 >preCollectArgDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7791,7 +7791,7 @@ module TypeScript {
 >preCollectVarDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7823,7 +7823,7 @@ module TypeScript {
 >preCollectFuncDeclTypes(ast, parent, context) : boolean
 >                                              : ^^^^^^^
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7896,7 +7896,7 @@ module TypeScript {
 
     export function postCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >postCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types
index 011cf47ae9f94..d5273187496c0 100644
--- a/tests/baselines/reference/parserRealSource8.types
+++ b/tests/baselines/reference/parserRealSource8.types
@@ -30,7 +30,7 @@ module TypeScript {
 
     export function pushAssignScope(scope: SymbolScope,
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 
@@ -317,7 +317,7 @@ module TypeScript {
 
     export function preAssignModuleScopes(ast: AST, context: AssignScopeContext) {
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -540,7 +540,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -614,7 +614,7 @@ module TypeScript {
 
     export function preAssignClassScopes(ast: AST, context: AssignScopeContext) {
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -887,7 +887,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, instanceType, classType, null) : void
 >                                                                  : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -934,7 +934,7 @@ module TypeScript {
 
     export function preAssignInterfaceScopes(ast: AST, context: AssignScopeContext) {
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1097,7 +1097,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -1118,7 +1118,7 @@ module TypeScript {
 
     export function preAssignWithScopes(ast: AST, context: AssignScopeContext) {
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1326,7 +1326,7 @@ module TypeScript {
 >pushAssignScope(withScope, context, null, null, null) : void
 >                                                      : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >withScope : any
 >          : ^^^
 >context : AssignScopeContext
@@ -1347,7 +1347,7 @@ module TypeScript {
 
     export function preAssignFuncDeclScopes(ast: AST, context: AssignScopeContext) {
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3274,7 +3274,7 @@ module TypeScript {
 >pushAssignScope(locals, context, thisType, null, funcDecl) : void
 >                                                           : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >locals : any
 >       : ^^^
 >context : AssignScopeContext
@@ -3288,7 +3288,7 @@ module TypeScript {
 
     export function preAssignCatchScopes(ast: AST, context: AssignScopeContext) {
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3382,7 +3382,7 @@ module TypeScript {
 >pushAssignScope(catchLocals, context, context.scopeChain.thisType, context.scopeChain.classType, context.scopeChain.fnc) : void
 >                                                                                                                         : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >catchLocals : any
 >            : ^^^
 >context : AssignScopeContext
@@ -3422,7 +3422,7 @@ module TypeScript {
 
     export function preAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >preAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3514,7 +3514,7 @@ module TypeScript {
 >preAssignModuleScopes(ast, context) : void
 >                                    : ^^^^
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3540,7 +3540,7 @@ module TypeScript {
 >preAssignClassScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3566,7 +3566,7 @@ module TypeScript {
 >preAssignInterfaceScopes(ast, context) : void
 >                                       : ^^^^
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3592,7 +3592,7 @@ module TypeScript {
 >preAssignWithScopes(ast, context) : void
 >                                  : ^^^^
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3618,7 +3618,7 @@ module TypeScript {
 >preAssignFuncDeclScopes(ast, context) : void
 >                                      : ^^^^
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3644,7 +3644,7 @@ module TypeScript {
 >preAssignCatchScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3698,7 +3698,7 @@ module TypeScript {
 
     export function postAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >postAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index ab395310ba98b..cde69fbfba44a 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -20,7 +20,7 @@ module TypeScript {
 
         public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) {
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >typeLinks : TypeLink[]
 >          : ^^^^^^^^^^
 >scope : SymbolScope
@@ -194,7 +194,7 @@ module TypeScript {
 
         public resolveBases(scope: SymbolScope, type: Type) {
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^           ^^    ^^    ^^^^^^^^^
+>             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -212,11 +212,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.extendsTypeLinks, scope) : Type[]
 >                                                        : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >type.extendsTypeLinks : any
 >                      : ^^^
 >type : Type
@@ -452,11 +452,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.implementsTypeLinks, scope) : Type[]
 >                                                           : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >type.implementsTypeLinks : any
 >                         : ^^^
 >type : Type
@@ -589,7 +589,7 @@ module TypeScript {
 
         public resolveSignatureGroup(signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) {
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >signatureGroup : SignatureGroup
 >               : ^^^^^^^^^^^^^^
 >scope : SymbolScope
@@ -732,11 +732,11 @@ module TypeScript {
 >this.bindSymbol(scope, signature.parameters[j]) : void
 >                                                : ^^^^
 >this.bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->                : ^     ^^           ^^      ^^      ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^           ^^      ^^      ^^^^^^^^^
+>           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >signature.parameters[j] : any
@@ -887,7 +887,7 @@ module TypeScript {
 
         public bindType(scope: SymbolScope, type: Type, instanceType: Type): void {
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -903,11 +903,11 @@ module TypeScript {
 >this.bindType(scope, instanceType, null) : void
 >                                         : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >instanceType : Type
@@ -1115,11 +1115,11 @@ module TypeScript {
 >this.bind(agg, type.members.allMembers) : void
 >                                        : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >type.members.allMembers : any
@@ -1141,11 +1141,11 @@ module TypeScript {
 >this.bind(agg, typeMembers.allMembers) : void
 >                                       : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >typeMembers.allMembers : any
@@ -1163,11 +1163,11 @@ module TypeScript {
 >this.bind(agg, ambientMembers.allMembers) : void
 >                                          : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientMembers.allMembers : any
@@ -1185,11 +1185,11 @@ module TypeScript {
 >this.bind(agg, ambientTypeMembers.allMembers) : void
 >                                              : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientTypeMembers.allMembers : any
@@ -1243,11 +1243,11 @@ module TypeScript {
 >this.resolveBases(scope, type) : void
 >                               : ^^^^
 >this.resolveBases : (scope: SymbolScope, type: Type) => void
->                  : ^     ^^           ^^    ^^    ^^^^^^^^^
+>                  : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^           ^^    ^^    ^^^^^^^^^
+>             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -1265,11 +1265,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.construct, scope, instanceType) : void
 >                                                                : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.construct : any
 >               : ^^^
 >type : Type
@@ -1293,11 +1293,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.call, scope, null) : void
 >                                                   : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.call : any
 >          : ^^^
 >type : Type
@@ -1319,11 +1319,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.index, scope, null) : void
 >                                                    : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.index : any
 >           : ^^^
 >type : Type
@@ -1345,11 +1345,11 @@ module TypeScript {
 >this.bindType(scope, type.elementType, null) : void
 >                                             : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type.elementType : any
@@ -1363,7 +1363,7 @@ module TypeScript {
 
         public bindSymbol(scope: SymbolScope, symbol: Symbol) {
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^           ^^      ^^      ^^^^^^^^^
+>           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >symbol : Symbol
@@ -1715,11 +1715,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.type, typeSymbol.instanceType) : void
 >                                                               : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.type : any
@@ -1778,11 +1778,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.expansions[i], typeSymbol.instanceType) : void
 >                                                                        : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.expansions[i] : any
@@ -1925,7 +1925,7 @@ module TypeScript {
 
         public bind(scope: SymbolScope, table: IHashTable) {
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >table : IHashTable
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.types b/tests/baselines/reference/parserUnterminatedGeneric1.types
index 549ca935c184d..12c025090c4b2 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.types
@@ -4,7 +4,7 @@
  interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^        
+>    : ^        ^^               ^^^^^^^^^^^^^
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types
index b947eed9d1388..2f5be1ab9ff4c 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.types
@@ -39,7 +39,7 @@ declare module ng {
     interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^        
+>    : ^        ^^               ^^^^^^^^^^^^^
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.types b/tests/baselines/reference/parserX_ArrowFunction1.types
index b81026b7751d5..9231ec5c45df6 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.types
+++ b/tests/baselines/reference/parserX_ArrowFunction1.types
@@ -3,9 +3,9 @@
 === parserX_ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^   ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^   ^^^^^^^^^
+>               : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index 0326d8453ba19..2828e5164aaf3 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -4320,7 +4320,7 @@ module Harness {
             /** create file gets the whole path to create, so this works as expected with the --out parameter */
             public createFile(s: string, useUTF8?: boolean): ITextWriter {
 >createFile : (s: string, useUTF8?: boolean) => ITextWriter
->           : ^ ^^      ^^       ^^^       ^^^^^           
+>           : ^ ^^      ^^       ^^^       ^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
 >useUTF8 : boolean
@@ -4687,7 +4687,7 @@ module Harness {
 
         export function makeDefaultCompilerForTest(c?: TypeScript.TypeScriptCompiler) {
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^                             ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >c : TypeScript.TypeScriptCompiler
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6448,11 +6448,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^              ^^^^^^^^^^^
+>                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6602,11 +6602,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^              ^^^^^^^^^^^
+>                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6816,7 +6816,7 @@ module Harness {
 
             private getTypeInfoName(ast : TypeScript.AST) {
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8329,7 +8329,7 @@ module Harness {
 >makeDefaultCompilerForTest() : any
 >                             : ^^^
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^                             ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
             if (usePull) {
 >usePull : boolean
@@ -8733,7 +8733,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8797,7 +8797,7 @@ module Harness {
 >callback : (res: CompilerResult) => void
 >         : ^   ^^              ^^^^^    
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : CompilationContext
 >        : ^^^^^^^^^^^^^^^^^^
 >references : TypeScript.IFileReference[]
@@ -8816,7 +8816,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8931,13 +8931,13 @@ module Harness {
 
             if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 
                 settingsCallback(compiler.settings);
 >settingsCallback(compiler.settings) : void
 >                                    : ^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >compiler.settings : any
 >                  : ^^^
 >compiler : TypeScript.TypeScriptCompiler
@@ -8991,7 +8991,7 @@ module Harness {
                 // So that a test doesn't have side effects for tests run after it, restore the compiler settings to their previous state.
                 if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 
                     compiler.settings = oldCompilerSettings;
 >compiler.settings = oldCompilerSettings : any
@@ -9184,7 +9184,7 @@ module Harness {
 
         export function emit(ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) {
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >ioHost : TypeScript.EmitterIOHost
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -9360,7 +9360,7 @@ module Harness {
 >emit(stdout, true) : void
 >                   : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >true : true
@@ -9383,7 +9383,7 @@ module Harness {
 >emit(stdout, false) : void
 >                    : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >false : false
@@ -10326,7 +10326,7 @@ module Harness {
 
         public editRanges: { length: number; editRange: TypeScript.ScriptEditRange; }[] = [];
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >editRange : TypeScript.ScriptEditRange
@@ -10371,11 +10371,11 @@ module Harness {
 >this.editRanges = [] : undefined[]
 >                     : ^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -10494,15 +10494,15 @@ module Harness {
 >this.editRanges.push({                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            }) : number
 >                                                                                                                                                                                                  : ^^^^^^
 >this.editRanges.push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
+>                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
+>     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >{                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            } : { length: number; editRange: any; }
 >                                                                                                                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -10560,11 +10560,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >this.maxScriptVersions : number
@@ -10576,17 +10576,17 @@ module Harness {
 
                 this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length);
 >this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
+>                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
+>       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
 >this.maxScriptVersions - this.editRanges.length : number
@@ -10600,11 +10600,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
             }
@@ -10623,7 +10623,7 @@ module Harness {
 
         public getEditRangeSinceVersion(version: number): TypeScript.ScriptEditRange {
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^                          
+>                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >version : number
 >        : ^^^^^^
 >TypeScript : any
@@ -10653,11 +10653,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >(this.version - version) : number
@@ -10689,11 +10689,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -10715,19 +10715,19 @@ module Harness {
 
             var entries = this.editRanges.slice(initialEditRangeIndex);
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.slice(initialEditRangeIndex) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >initialEditRangeIndex : number
 >                      : ^^^^^^
 
@@ -10741,21 +10741,21 @@ module Harness {
 >entries.map(x => x.editRange.minChar) : any[]
 >                                      : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.minChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
+>                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.editRange.minChar : any
 >                    : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -10791,21 +10791,21 @@ module Harness {
 >entries.map(x => x.length - x.editRange.limChar) : number[]
 >                                                 : ^^^^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.length - x.editRange.limChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => number
->                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^
+>                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.length - x.editRange.limChar : number
 >                               : ^^^^^^
 >x.length : number
 >         : ^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >x.editRange.limChar : any
@@ -10813,7 +10813,7 @@ module Harness {
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >limChar : any
@@ -10849,21 +10849,21 @@ module Harness {
 >entries.map(x => x.editRange.delta) : any[]
 >                                    : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.delta : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
+>                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.editRange.delta : any
 >                  : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >delta : any
@@ -10899,9 +10899,9 @@ module Harness {
 >entries[0].length : number
 >                  : ^^^^^^
 >entries[0] : { length: number; editRange: TypeScript.ScriptEditRange; }
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
 >length : number
@@ -11495,7 +11495,7 @@ module Harness {
 >this.scripts[scriptIndex].getEditRangeSinceVersion(scriptVersion) : TypeScript.ScriptEditRange
 >                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex].getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                                                   : ^       ^^      ^^^^^                          
+>                                                   : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex] : ScriptInfo
 >                          : ^^^^^^^^^^
 >this.scripts : ScriptInfo[]
@@ -11507,7 +11507,7 @@ module Harness {
 >scriptIndex : number
 >            : ^^^^^^
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^                          
+>                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >scriptVersion : number
 >              : ^^^^^^
 
@@ -11557,7 +11557,7 @@ module Harness {
          */
         public getLanguageService(): Services.ILanguageServiceShim {
 >getLanguageService : () => Services.ILanguageServiceShim
->                   : ^^^^^^                             
+>                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Services : any
 >         : ^^^
 
@@ -11613,7 +11613,7 @@ module Harness {
         /** Parse file given its source text */
         public parseSourceText(fileName: string, sourceText: TypeScript.ISourceText): TypeScript.Script {
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^                      ^^^^^                 
+>                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >sourceText : TypeScript.ISourceText
@@ -11721,11 +11721,11 @@ module Harness {
 >this.parseSourceText(fileName, sourceText) : TypeScript.Script
 >                                           : ^^^^^^^^^^^^^^^^^
 >this.parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                     : ^        ^^      ^^          ^^                      ^^^^^                 
+>                     : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^                      ^^^^^                 
+>                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >sourceText : any
@@ -11871,7 +11871,7 @@ module Harness {
         */
         public positionToZeroBasedLineCol(fileName: string, position: number): TypeScript.ILineCol {
 >positionToZeroBasedLineCol : (fileName: string, position: number) => TypeScript.ILineCol
->                           : ^        ^^      ^^        ^^      ^^^^^                   
+>                           : ^        ^^      ^^        ^^      ^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >position : number
@@ -12279,25 +12279,25 @@ module Harness {
 
             var temp = mapEdits(edits).sort(function (a, b) {
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort(function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            }) : { edit: Services.TextEdit; index: number; }[]
->                                                                                                                                                                                                                               : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                                                                                                                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->                     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits) : { edit: Services.TextEdit; index: number; }[]
->                : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits : (edits: Services.TextEdit[]) => { edit: Services.TextEdit; index: number; }[]
 >         : ^     ^^                   ^^^^^                                             
 >edits : Services.TextEdit[]
 >      : ^^^^^^^^^^^^^^^^^^^
 >sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            } : (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number
->                                                                                                                                                                                                         : ^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^^^^^^^
+>                                                                                                                                                                                                         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 
                 var result = a.edit.minChar - b.edit.minChar;
 >result : number
@@ -12309,7 +12309,7 @@ module Harness {
 >a.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12319,7 +12319,7 @@ module Harness {
 >b.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12343,13 +12343,13 @@ module Harness {
 >a.index : number
 >        : ^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 >b.index : number
 >        : ^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 
@@ -12379,7 +12379,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12389,9 +12389,9 @@ module Harness {
 >temp[current].edit : Services.TextEdit
 >                   : ^^^^^^^^^^^^^^^^^
 >temp[current] : { edit: Services.TextEdit; index: number; }
->              : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >current : number
 >        : ^^^^^^
 >edit : Services.TextEdit
@@ -12406,7 +12406,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12436,9 +12436,9 @@ module Harness {
 >temp[next].edit : Services.TextEdit
 >                : ^^^^^^^^^^^^^^^^^
 >temp[next] : { edit: Services.TextEdit; index: number; }
->           : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >next : number
 >     : ^^^^^^
 >edit : Services.TextEdit
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index 0d93f460d18e4..773edd88ec266 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -145,11 +145,11 @@ module Formatting {
 >this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree) : void
 >                                                                          : ^^^^
 >this.ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                                 : ^                       ^^      ^^    ^^         ^^^^^    
+>                                 : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^         ^^^^^    
+>                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >this.languageHostIndentation : string
 >                             : ^^^^^^
 >this : this
@@ -167,11 +167,11 @@ module Formatting {
 >this.FillInheritedIndentation(this.tree) : void
 >                                         : ^^^^
 >this.FillInheritedIndentation : (tree: ParseTree) => void
->                              : ^    ^^         ^^^^^    
+>                              : ^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^         ^^^^^    
+>                         : ^    ^^^^^^^^^^^^^^^^    
 >this.tree : ParseTree
 >          : ^^^^^^^^^
 >this : this
@@ -183,7 +183,7 @@ module Formatting {
 
         public GetIndentationEdits(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEdits : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                    : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                    : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -332,11 +332,11 @@ module Formatting {
 >this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent) : List_TextEditInfo
 >                                                                       : ^^^^^^^^^^^^^^^^^
 >this.GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                               : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                               : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -477,7 +477,7 @@ module Formatting {
 
         public GetIndentationEditsWorker(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -513,11 +513,11 @@ module Formatting {
 >this.AdjustStartOffsetIfNeeded(token, node) : void
 >                                            : ^^^^
 >this.AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                               : ^     ^^         ^^    ^^         ^^^^^    
+>                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^         ^^    ^^         ^^^^^    
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -558,11 +558,11 @@ module Formatting {
 >this.IsMultiLineString(token) : boolean
 >                              : ^^^^^^^
 >this.IsMultiLineString : (token: TokenSpan) => boolean
->                       : ^     ^^         ^^^^^       
+>                       : ^     ^^^^^^^^^^^^^^^^       
 >this : this
 >     : ^^^^
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^         ^^^^^       
+>                  : ^     ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -580,11 +580,11 @@ module Formatting {
 >this.GetSpecialCaseIndentation(token, node) : IndentationInfo
 >                                            : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                               : ^     ^^         ^^    ^^         ^^^^^               
+>                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^         ^^    ^^         ^^^^^               
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -811,11 +811,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^         ^^    ^^         ^^^^^               
+>                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -837,11 +837,11 @@ module Formatting {
 >this.GetIndentEdit(indentationInfo, token.Span.startPosition(), sameLineIndent) : TextEditInfo
 >                                                                                : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >indentationInfo : IndentationInfo
 >                : ^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
@@ -869,11 +869,11 @@ module Formatting {
 >this.RegisterIndentation(edit, sameLineIndent) : void
 >                                               : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^            ^^              ^^       ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >edit : TextEditInfo
 >     : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -914,11 +914,11 @@ module Formatting {
 >this.GetCommentIndentationEdits(token) : List_TextEditInfo
 >                                       : ^^^^^^^^^^^^^^^^^
 >this.GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                                : ^     ^^         ^^^^^                 
+>                                : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^         ^^^^^                 
+>                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -960,7 +960,7 @@ module Formatting {
 
         private GetCommentIndentationEdits(token: TokenSpan): List_TextEditInfo {
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^         ^^^^^                 
+>                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -1140,11 +1140,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(lineIndent, commentFirstLineIndentationDelta) : IndentationInfo
 >                                                                          : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^               
+>                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >lineIndent : string
 >           : ^^^^^^
 >commentFirstLineIndentationDelta : number
@@ -1176,11 +1176,11 @@ module Formatting {
 >this.GetIndentEdit(commentIndentationInfo, tokenStartPosition, false) : TextEditInfo
 >                                                                      : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >commentIndentationInfo : IndentationInfo
 >                       : ^^^^^^^^^^^^^^^
 >tokenStartPosition : any
@@ -1217,7 +1217,7 @@ module Formatting {
 
         static GetIndentSizeFromIndentText(indentText: string, editorOptions: Services.EditorOptions): number {
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >indentText : string
 >           : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1240,7 +1240,7 @@ module Formatting {
 
         static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number {
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >text : string
 >     : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1371,7 +1371,7 @@ module Formatting {
 
         private GetSpecialCaseIndentation(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^         ^^    ^^         ^^^^^               
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1405,11 +1405,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForLCurly(node) : IndentationInfo
 >                                              : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                        : ^    ^^         ^^^^^               
+>                                        : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^         ^^^^^               
+>                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1605,11 +1605,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForSemicolon(token, node) : IndentationInfo
 >                                                        : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                           : ^     ^^         ^^    ^^         ^^^^^               
+>                                           : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^         ^^    ^^         ^^^^^               
+>                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1627,11 +1627,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForComment(token, node) : IndentationInfo
 >                                                      : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                         : ^     ^^         ^^    ^^         ^^^^^               
+>                                         : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^         ^^    ^^         ^^^^^               
+>                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1646,7 +1646,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForLCurly(node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^         ^^^^^               
+>                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1805,7 +1805,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForSemicolon(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^         ^^    ^^         ^^^^^               
+>                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1941,7 +1941,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForComment(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^         ^^    ^^         ^^^^^               
+>                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2058,11 +2058,11 @@ module Formatting {
 >this.CanIndentComment(token, node) : boolean
 >                                   : ^^^^^^^
 >this.CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                      : ^     ^^         ^^    ^^         ^^^^^       
+>                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >this : this
 >     : ^^^^
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^         ^^    ^^         ^^^^^       
+>                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2093,11 +2093,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^         ^^    ^^         ^^^^^               
+>                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2112,7 +2112,7 @@ module Formatting {
 
         private CanIndentComment(token: TokenSpan, node: ParseNode): boolean {
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^         ^^    ^^         ^^^^^       
+>                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2339,7 +2339,7 @@ module Formatting {
 
         private ApplyScriptBlockIndentation(languageHostIndentation: string, tree: ParseTree): void
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^         ^^^^^    
+>                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >languageHostIndentation : string
 >                        : ^^^^^^
 >tree : ParseTree
@@ -2441,7 +2441,7 @@ module Formatting {
 
         private GetIndentEdit(indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean): TextEditInfo {
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >indentInfo : IndentationInfo
 >           : ^^^^^^^^^^^^^^^
 >tokenStartPosition : number
@@ -3005,7 +3005,7 @@ module Formatting {
 
         private  ApplyIndentationDeltaFromParent(token: TokenSpan, node: ParseNode): IndentationInfo {
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -3135,11 +3135,11 @@ module Formatting {
 >this.ApplyIndentationDelta1(token.Span.startPosition(), parentIndentationDeltaSize) : IndentationInfo
 >                                                                                    : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                            : ^                  ^^      ^^     ^^      ^^^^^               
+>                            : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^               
+>                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
 >                           : ^^^
 >token.Span.startPosition : any
@@ -3164,7 +3164,7 @@ module Formatting {
 
         private ApplyIndentationDelta1(tokenStartPosition: number, delta: number): IndentationInfo {
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^               
+>                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >tokenStartPosition : number
 >                   : ^^^^^^
 >delta : number
@@ -3240,11 +3240,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(currentIndent, delta) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^               
+>                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >currentIndent : any
 >              : ^^^
 >delta : number
@@ -3253,7 +3253,7 @@ module Formatting {
 
         private ApplyIndentationDelta2(currentIndent: string, delta: number): IndentationInfo {
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >currentIndent : string
 >              : ^^^^^^
 >delta : number
@@ -3275,11 +3275,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(currentIndent, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >currentIndent : string
 >              : ^^^^^^
 >this.editorOptions : Services.EditorOptions
@@ -3499,11 +3499,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromText(origIndentText, this.editorOptions, /*includeNonIndentChars*/true) : number
 >                                                                                                  : ^^^^^^
 >Indenter.GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                               : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                               : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3521,11 +3521,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(newIndentText, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >newIndentText : any
 >              : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3613,11 +3613,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(childIndentText, this.editorOptions) : number
 >                                                                          : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >childIndentText : any
 >                : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3643,11 +3643,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(origIndentText, this.editorOptions) : number
 >                                                                         : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3696,7 +3696,7 @@ module Formatting {
 
         private FillInheritedIndentation(tree: ParseTree): void
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^         ^^^^^    
+>                         : ^    ^^^^^^^^^^^^^^^^    
 >tree : ParseTree
 >     : ^^^^^^^^^
         {
@@ -4642,7 +4642,7 @@ module Formatting {
 
         private RegisterIndentation(indent: TextEditInfo, sameLineIndent: boolean): void
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >indent : TextEditInfo
 >       : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -4772,11 +4772,11 @@ module Formatting {
 >this.RegisterIndentation(new TextEditInfo(position, 0, indent), false) : void
 >                                                                       : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^            ^^              ^^       ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >new TextEditInfo(position, 0, indent) : any
 >                                      : ^^^
 >TextEditInfo : any
@@ -4793,7 +4793,7 @@ module Formatting {
 
         private AdjustStartOffsetIfNeeded(token: TokenSpan, node: ParseNode): void
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^         ^^    ^^         ^^^^^    
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -4982,7 +4982,7 @@ module Formatting {
 
         private IsMultiLineString(token: TokenSpan): boolean {
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^         ^^^^^       
+>                  : ^     ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index b7365ddb1c871..6e2f15b99bac9 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -1542,7 +1542,7 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^                    
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1552,13 +1552,13 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
->                            : ^^^^^^                    
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^                    
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1568,7 +1568,7 @@ export declare module "use_glo_M1_public" {
 
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
->                             : ^^^^^^                    
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1646,7 +1646,7 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_public : new () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^                     
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1656,13 +1656,13 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_public : () => use_glo_M4_private.c1
->                             : ^^^^^^                     
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
     var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_private : new () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^                     
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1672,7 +1672,7 @@ declare module "use_glo_M3_private" {
 
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_private : () => use_glo_M4_private.c1
->                              : ^^^^^^                     
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
index 7bc83bc1f9987..ff9599ec47844 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
@@ -6,7 +6,7 @@ declare namespace lf {
   export interface Transaction {
     attach(query: query.Builder): Promise<Array<Object>>
 >attach : (query: query.Builder) => Promise<Array<Object>>
->       : ^     ^^             ^^^^^                      
+>       : ^     ^^^^^^^^^^^^^^^^^^^^                      
 >query : query.Builder
 >      : ^^^^^^^^^^^^^
 >query : any
@@ -38,7 +38,7 @@ declare namespace lf {
 
     stats(): TransactionStats
 >stats : () => TransactionStats
->      : ^^^^^^                
+>      : ^^^^^^^^^^^^^^^^^^^^^^
   }
 }
 === lovefield.js ===
@@ -60,7 +60,7 @@ lf.Transaction = function() {};
  */
 lf.Transaction.prototype.begin = function(scope) {};
 >lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                                                    : ^     ^^                      ^^^^^         
+>                                                    : ^     ^^                      ^^^^^^^^^^^^^^
 >lf.Transaction.prototype.begin : any
 >                               : ^^^
 >lf.Transaction.prototype : any
@@ -76,7 +76,7 @@ lf.Transaction.prototype.begin = function(scope) {};
 >begin : any
 >      : ^^^
 >function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                   : ^     ^^                      ^^^^^         
+>                   : ^     ^^                      ^^^^^^^^^^^^^^
 >scope : lf.schema.Table[]
 >      : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 092de33da333b..7cb4b6c38b526 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -34,7 +34,7 @@ declare module Sample.Thing {
   
   		getDomNode(): Element;
 >getDomNode : () => Element
->           : ^^^^^^       
+>           : ^^^^^^^^^^^^^
 		
 		addWidget(widgetId:string, widget:IWidget);
 >addWidget : (widgetId: string, widget: IWidget) => any
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
index 650478677ba83..b9724d792d72b 100644
--- a/tests/baselines/reference/recursiveMappedTypes.types
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -35,8 +35,8 @@ type tup = [number, number, number, number];
 >    : ^^^
 
 function foo(arg: Circular<tup>): tup {
->foo : (arg: Circular<tup>) => tup
->    : ^   ^^             ^^^^^   
+>foo : (arg: any) => tup
+>    : ^   ^^^^^^^^^^   
 >arg : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types
index 9f8d4d2de2a60..86b2b2a76f206 100644
--- a/tests/baselines/reference/recursiveTypeComparison2.types
+++ b/tests/baselines/reference/recursiveTypeComparison2.types
@@ -54,7 +54,7 @@ declare module Bacon {
 >initState : U
 >          : ^
 >f : (state: U, event: Event<T>) => StateValue<U, V>
->  : ^     ^^ ^^     ^^        ^^^^^                
+>  : ^     ^^ ^^     ^^        ^^^^^^^^^^^^^^^^^^^^^
 >state : U
 >      : ^
 >event : Event<T>
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index 14fc3c854d501..ea8075748f21c 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -117,7 +117,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
 >       : ^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^ ^^          ^^^             ^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: ClassNameObject, key: keyof S) => ClassNameObject
->                                                                                                                                                                                  : ^   ^^               ^^   ^^       ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                  : ^   ^^^^^^^^^^^^^^^^^^^   ^^       ^^^^^^^^^^^^^^^^^^^^
 >obj : ClassNameObject
 >    : ^^^^^^^^^^^^^^^
 >key : keyof S
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index 6610909f4dfd1..f56cf51e130ee 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -39,56 +39,56 @@ class Three<T, U, V>{
 }
 
 function A1(): One { return null; }
->A1 : () => One
->   : ^^^^^^   
+>A1 : () => any
+>   : ^^^^^^^^^
 
 function A2(): Two { return null; }
->A2 : () => Two
->   : ^^^^^^   
+>A2 : () => any
+>   : ^^^^^^^^^
 
 function A3(): Three { return null; }
->A3 : () => Three
->   : ^^^^^^     
+>A3 : () => any
+>   : ^^^^^^^^^
 
 function B1(): Two<number> { return null; }
->B1 : () => Two<number>
->   : ^^^^^^           
+>B1 : () => any
+>   : ^^^^^^^^^
 
 function B2(): Three<string> { return null; }
->B2 : () => Three<string>
->   : ^^^^^^             
+>B2 : () => any
+>   : ^^^^^^^^^
 
 function B3(): Three<string, number> { return null; }
->B3 : () => Three<string, number>
->   : ^^^^^^                     
+>B3 : () => any
+>   : ^^^^^^^^^
 
 class C {
 >C : C
 >  : ^
 
     A1(): One { return null; }
->A1 : () => One
->   : ^^^^^^   
+>A1 : () => any
+>   : ^^^^^^^^^
 
     A2(): Two { return null; }
->A2 : () => Two
->   : ^^^^^^   
+>A2 : () => any
+>   : ^^^^^^^^^
 
     A3(): Three { return null; }
->A3 : () => Three
->   : ^^^^^^     
+>A3 : () => any
+>   : ^^^^^^^^^
 
     B1(): Two<number> { return null; }
->B1 : () => Two<number>
->   : ^^^^^^           
+>B1 : () => any
+>   : ^^^^^^^^^
 
     B2(): Three<string> { return null; }
->B2 : () => Three<string>
->   : ^^^^^^             
+>B2 : () => any
+>   : ^^^^^^^^^
 
     B3(): Three<string, number> { return null; }
->B3 : () => Three<string, number>
->   : ^^^^^^                     
+>B3 : () => any
+>   : ^^^^^^^^^
 }
 
 class D<T> {
@@ -96,24 +96,24 @@ class D<T> {
 >  : ^^^^
 
     A2(): Two<T> { return null; }
->A2 : () => Two<T>
->   : ^^^^^^      
+>A2 : () => any
+>   : ^^^^^^^^^
 
     A3(): Three<T> { return null; }
->A3 : () => Three<T>
->   : ^^^^^^        
+>A3 : () => any
+>   : ^^^^^^^^^
 
     B1(): Two<T> { return null; }
->B1 : () => Two<T>
->   : ^^^^^^      
+>B1 : () => any
+>   : ^^^^^^^^^
 
     B2(): Three<T> { return null; }
->B2 : () => Three<T>
->   : ^^^^^^        
+>B2 : () => any
+>   : ^^^^^^^^^
 
     B3(): Three<string, T> { return null; }
->B3 : () => Three<string, T>
->   : ^^^^^^                
+>B3 : () => any
+>   : ^^^^^^^^^
 }
 
 interface I<T> {
@@ -136,8 +136,8 @@ class X<T>
 >  : ^^^^
 {
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -158,8 +158,8 @@ class X<T>
 >   : ^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
@@ -181,12 +181,12 @@ class X<T>
 }
 
 declare var a: {
->a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: X; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: Y; }
->  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^
+>a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: any; }
+>  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^
 
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -207,8 +207,8 @@ declare var a: {
 >   : ^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index 18833168898e4..d4b647d19d444 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -45,7 +45,7 @@ module Foo.Bar {
 
     function foo(greeting: string): Foo.Bar.Greeter {
 >foo : (greeting: string) => Foo.Bar.Greeter
->    : ^        ^^      ^^^^^               
+>    : ^        ^^      ^^^^^^^^^^^^^^^^^^^^
 >greeting : string
 >         : ^^^^^^
 >Foo : any
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index b61028cde79de..157f53f468e87 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -8,23 +8,23 @@ import WinJS = require('staticInstanceResolution5_0');
 // these 3 should be errors
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^     ^^^^^^^^^
+>                   : ^  ^^^^^^^^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
 var y = function (w2: WinJS) { }
 >y : (w2: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >function (w2: WinJS) { } : (w2: WinJS) => void
->                         : ^  ^^     ^^^^^^^^^
+>                         : ^  ^^^^^^^^^^^^^^^^
 >w2 : WinJS
 >   : ^^^^^
 
 function z(w3: WinJS) { }
 >z : (w3: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >w3 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
index 296bd6f3ed763..2c0cdd3fb0024 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
@@ -12,7 +12,7 @@ class C<T> {
 
     static f(x: T) {}
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
@@ -27,7 +27,7 @@ class C2<T, U> {
 
     static f(x: U) { }
 >f : (x: U) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : U
 >  : ^
 }
@@ -42,7 +42,7 @@ class C3<T extends Date> {
 
     static f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
index 4faf575220e70..5de409da74475 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
@@ -7,7 +7,7 @@ class C<T> {
 
     static s(p: T) { return p; }
 >s : (p: T) => T
->  : ^ ^^ ^^^^^^
+>  : ^ ^^^^^^^^^
 >p : T
 >  : ^
 >p : T
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index abffd78a7f044..9af014859e0cb 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -101,7 +101,7 @@ function foo() {
 
     function foo(x: private.x) { }
 >foo : (x: private.x) => void
->    : ^ ^^         ^^^^^^^^^
+>    : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : private.x
 >  : ^^^^^^^^^
 >private : any
@@ -109,7 +109,7 @@ function foo() {
 
     function foo1(x: private.package.x) { }
 >foo1 : (x: private.package.x) => void
->     : ^ ^^                 ^^^^^^^^^
+>     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : private.package.x
 >  : ^^^^^^^^^^^^^^^^^
 >private : any
@@ -119,7 +119,7 @@ function foo() {
 
     function foo2(x: private.package.protected) { }
 >foo2 : (x: private.package.protected) => void
->     : ^ ^^                         ^^^^^^^^^
+>     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : private.package.protected
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >private : any
diff --git a/tests/baselines/reference/thisTypeErrors.types b/tests/baselines/reference/thisTypeErrors.types
index 47ecf4c09ddd2..a336a9aa6e191 100644
--- a/tests/baselines/reference/thisTypeErrors.types
+++ b/tests/baselines/reference/thisTypeErrors.types
@@ -6,8 +6,8 @@ var x1: this;
 >   : ^^^
 
 var x2: { a: this };
->x2 : { a: this; }
->   : ^^^^^    ^^^
+>x2 : { a: any; }
+>   : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -16,8 +16,8 @@ var x3: this[];
 >   : ^^^^^
 
 function f1(x: this): this {
->f1 : (x: this) => this
->   : ^ ^^    ^^^^^    
+>f1 : (x: any) => any
+>   : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -32,18 +32,18 @@ function f1(x: this): this {
 
 interface I1 {
     a: { x: this };
->a : { x: this; }
->  : ^^^^^    ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => this
->  : ^^^^^^    
+>b : () => any
+>  : ^^^^^^^^^
 
     c: { new (): this };
->c : new () => this
->  : ^^^^^^^^^^    
+>c : new () => any
+>  : ^^^^^^^^^^^^^
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -52,10 +52,10 @@ interface I1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: this): this; }
->  : ^^^^ ^^    ^^^    ^^^
->f : (x: this) => this
->  : ^ ^^    ^^^^^    
+>e : { f(x: any): any; }
+>  : ^^^^ ^^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 }
@@ -65,18 +65,18 @@ class C1 {
 >   : ^^
 
     a: { x: this };
->a : { x: this; }
->  : ^^^^^    ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => this
->  : ^^^^^^    
+>b : () => any
+>  : ^^^^^^^^^
 
     c: { new (): this };
->c : new () => this
->  : ^^^^^^^^^^    
+>c : new () => any
+>  : ^^^^^^^^^^^^^
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -85,10 +85,10 @@ class C1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: this): this; }
->  : ^^^^ ^^    ^^^    ^^^
->f : (x: this) => this
->  : ^ ^^    ^^^^^    
+>e : { f(x: any): any; }
+>  : ^^^^ ^^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 }
@@ -110,8 +110,8 @@ class C2 {
 >          : ^^^^^^^^^
 
     static foo(x: this): this {
->foo : (x: this) => this
->    : ^ ^^    ^^^^^    
+>foo : (x: any) => any
+>    : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -141,14 +141,14 @@ class C3 {
 >   : ^^
 
     x1 = {
->x1 : { g(x: this): this; }
->   : ^^^^ ^^    ^^^    ^^^
->{        g(x: this): this {            return undefined;        }    } : { g(x: this): this; }
->                                                                       : ^^^^ ^^    ^^^    ^^^
+>x1 : { g(x: any): any; }
+>   : ^^^^ ^^^^^^^^^^^^^^
+>{        g(x: this): this {            return undefined;        }    } : { g(x: any): any; }
+>                                                                       : ^^^^ ^^^^^^^^^^^^^^
 
         g(x: this): this {
->g : (x: this) => this
->  : ^ ^^    ^^^^^    
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -162,8 +162,8 @@ class C3 {
 >  : ^^^^^^^^^^
 
         function g(x: this): this {
->g : (x: this) => this
->  : ^ ^^    ^^^^^    
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -172,14 +172,14 @@ class C3 {
 >          : ^^^^^^^^^
         }
         let x2 = {
->x2 : { h(x: this): this; }
->   : ^^^^ ^^    ^^^    ^^^
->{            h(x: this): this {                return undefined;            }        } : { h(x: this): this; }
->                                                                                       : ^^^^ ^^    ^^^    ^^^
+>x2 : { h(x: any): any; }
+>   : ^^^^ ^^^^^^^^^^^^^^
+>{            h(x: this): this {                return undefined;            }        } : { h(x: any): any; }
+>                                                                                       : ^^^^ ^^^^^^^^^^^^^^
 
             h(x: this): this {
->h : (x: this) => this
->  : ^ ^^    ^^^^^    
+>h : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index 7fda3c139ac01..b493759532198 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -58,7 +58,7 @@ function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 
 function hasMissingIsKeyword(): x {
 >hasMissingIsKeyword : () => x
->                    : ^^^^^^ 
+>                    : ^^^^^^^
 
     return true;
 >true : true
@@ -330,7 +330,7 @@ var b1: b is A;
 
 function b2(a: b is A) {};
 >b2 : (a: b, is: any, A: any) => void
->   : ^ ^^ ^^  ^^^^^^^ ^^^^^^^^^^^^^^
+>   : ^ ^^^^^  ^^^^^^^ ^^^^^^^^^^^^^^
 >a : b
 >  : ^
 >is : any
@@ -339,8 +339,8 @@ function b2(a: b is A) {};
 >  : ^^^
 
 function b3(): A | b is A {
->b3 : () => A | b
->   : ^^^^^^     
+>b3 : () => any
+>   : ^^^^^^^^^
 >is : any
 >   : ^^^
 >A : typeof A
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
index 47f7c866ed0ee..4b6de36790962 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
@@ -50,7 +50,7 @@ interface I<T, U extends T, V extends U> {
 
 function foo<T, U extends T>(x: T, y: U): V { // error
 >foo : <T, U extends T>(x: T, y: U) => V
->    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
+>    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^
 >x : T
 >  : ^
 >y : U
@@ -58,7 +58,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
     function bar<V extends T, W extends U>(): X { // error
 >bar : <V extends T, W extends U>() => X
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -85,7 +85,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
 function foo2<U extends T, T>(x: T, y: U): W { // error
 >foo2 : <U extends T, T>(x: T, y: U) => W
->     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
+>     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^
 >x : T
 >  : ^
 >y : U
@@ -93,7 +93,7 @@ function foo2<U extends T, T>(x: T, y: U): W { // error
 
     function bar<V extends T, W extends U>(): Y { // error
 >bar : <V extends T, W extends U>() => Y
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -130,7 +130,7 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
     function bar<V extends T, W extends U>(r: X, s: Y) { // error
 >bar : <V extends T, W extends U>(r: X, s: Y) => void
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^
 >r : X
 >  : ^
 >s : Y
@@ -163,9 +163,9 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
 var f4 = <U extends T, T>(x: V, y: X) => { // error
 >f4 : <U extends T, T>(x: V, y: X) => void
->   : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>   : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
 ><U extends T, T>(x: V, y: X) => { // error    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: V, y: X) => void
->                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
 >x : V
 >  : ^
 >y : X
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.types b/tests/baselines/reference/typeParametersInStaticAccessors.types
index 77f3193522c9b..24e855a13a0c1 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.types
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.types
@@ -7,13 +7,13 @@ class foo<T> {
 
     static get Foo(): () => T { return null; }
 >Foo : () => T
->    : ^^^^^^ 
+>    : ^^^^^^^
 
     static set Bar(v: { v: T }) { }
 >Bar : { v: T; }
->    : ^^^^^ ^^^
+>    : ^^^^^^^^^
 >v : { v: T; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 >v : T
 >  : ^
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.types b/tests/baselines/reference/typeParametersInStaticMethods.types
index dcba9fc2668a2..9319245303c8a 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.types
+++ b/tests/baselines/reference/typeParametersInStaticMethods.types
@@ -9,11 +9,11 @@ class foo<T> {
 >M : (x: (x: T) => { x: { y: T; }; }) => void
 >  : ^ ^^                           ^^^^^^^^^
 >x : (x: T) => { x: { y: T; }; }
->  : ^ ^^ ^^^^^                 
+>  : ^ ^^^^^^^^                 
 >x : T
 >  : ^
 >x : { y: T; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 >y : T
 >  : ^
     }
diff --git a/tests/baselines/reference/typedefTagTypeResolution.types b/tests/baselines/reference/typedefTagTypeResolution.types
index c193bf7fa420b..9712bc5ef0ff8 100644
--- a/tests/baselines/reference/typedefTagTypeResolution.types
+++ b/tests/baselines/reference/typedefTagTypeResolution.types
@@ -9,8 +9,8 @@
  * @return {T}
  */
 function f(x) {
->f : <U>(x: U) => T
->  : ^ ^^ ^^ ^^^^^ 
+>f : <U>(x: U) => U
+>  : ^ ^^ ^^ ^^^^^^
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/typeofInObjectLiteralType.types b/tests/baselines/reference/typeofInObjectLiteralType.types
index 0e5ca99fcb430..5aa62c161c84c 100644
--- a/tests/baselines/reference/typeofInObjectLiteralType.types
+++ b/tests/baselines/reference/typeofInObjectLiteralType.types
@@ -2,8 +2,8 @@
 
 === typeofInObjectLiteralType.ts ===
 var a: { b: number; c: typeof b }; // Should give error for attempting to use type query on b.
->a : { b: number; c: typeof b; }
->  : ^^^^^      ^^^^^        ^^^
+>a : { b: number; c: any; }
+>  : ^^^^^      ^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
 >c : any
diff --git a/tests/baselines/reference/undeclaredModuleError.types b/tests/baselines/reference/undeclaredModuleError.types
index da0d54d795717..ce795bd32a875 100644
--- a/tests/baselines/reference/undeclaredModuleError.types
+++ b/tests/baselines/reference/undeclaredModuleError.types
@@ -11,7 +11,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >path : string
 >     : ^^^^^^
 >accept : (stat: fs.Stats, name: string) => boolean
->       : ^    ^^        ^^    ^^      ^^^^^       
+>       : ^    ^^^^^^^^^^^^    ^^      ^^^^^       
 >stat : fs.Stats
 >     : ^^^^^^^^
 >fs : any
@@ -23,7 +23,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >error : Error
 >      : ^^^^^
 >results : { name: string; stat: fs.Stats; }[]
->        : ^^^^^^^^      ^^^^^^^^        ^^^^^
+>        : ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
 >stat : fs.Stats
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index d1c1862c98357..ffa16ff343598 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -19,7 +19,7 @@ interface Query<T> {
 >item : T
 >     : ^
 >resultSelector : (outer: T, inner: U) => R
->               : ^     ^^ ^^     ^^ ^^^^^ 
+>               : ^     ^^ ^^     ^^ ^^^^^^
 >outer : T
 >      : ^
 >inner : U
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.types b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
index 8ade76d37e201..a35d347932961 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.types
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
@@ -11,7 +11,7 @@ class Linq {
 >values : T[]
 >       : ^^^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^ 
+>     : ^ ^^ ^^^^^^
 >v : T
 >  : ^
 
@@ -61,7 +61,7 @@ class Linq {
 >func(values[i]) : A
 >                : ^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^ 
+>     : ^ ^^ ^^^^^^
 >values[i] : T
 >          : ^
 >values : T[]
diff --git a/tests/baselines/reference/unknownSymbols1.types b/tests/baselines/reference/unknownSymbols1.types
index 4d2c58ee5ad39..d762a0d699509 100644
--- a/tests/baselines/reference/unknownSymbols1.types
+++ b/tests/baselines/reference/unknownSymbols1.types
@@ -13,7 +13,7 @@ var y: asdf;
 
 function foo(x: asdf, y: number): asdf { }
 >foo : (x: asdf, y: number) => asdf
->    : ^ ^^    ^^ ^^      ^^^^^    
+>    : ^ ^^^^^^^^ ^^      ^^^^^^^^^
 >x : asdf
 >  : ^^^^
 >y : number
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
index 764075a757be3..1edc387f4bf10 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
@@ -18,7 +18,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: import("./doesntexist.js").Foo);`,
+      insertText: `method(param: any);`,
       filterText: "method",
       hasAction: undefined,
     },
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
index 072725ac2f745..61396a635886b 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
@@ -21,7 +21,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: import("./doesntexist.js").Foo);`,
+      insertText: `method(param: any);`,
       filterText: "method",
       hasAction: undefined,
     },

From c5ffae513c66bc6bb58da66cae026a34e389eed7 Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Fri, 26 Jul 2024 18:28:14 -0700
Subject: [PATCH 02/11] Fixed typos

---
 src/compiler/checker.ts   | 3 +++
 src/harness/typeWriter.ts | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5c0b575ce88af..68350a3eb6975 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -27383,6 +27383,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function isFunctionObjectType(type: ObjectType): boolean {
+        if (getObjectFlags(type) & ObjectFlags.EvolvingArray) {
+            return false;
+        }
         // We do a quick check for a "bind" property before performing the more expensive subtype
         // check. This gives us a quicker out in the common case where an object type is not a function.
         const resolved = resolveStructuredTypeMembers(type);
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index b413432ddd4ee..12fca9494a9c9 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -279,7 +279,7 @@ export class TypeWriterWalker {
             }
             else {
                 const typeFormatFlags = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType | ts.TypeFormatFlags.GenerateNamesForShadowedTypeParams;
-                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask)) | ts.NodeBuilderFlagsIgnoreErrors)!;
+                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt(typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlagsIgnoreErrors)!;
                 if (ts.isIdentifier(node) && ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node && ts.isIdentifier(typeNode) && ts.idText(typeNode) === ts.idText(node)) {
                     // for a complex type alias `type T = ...`, showing "T : T" isn't very helpful for type tests. When the type produced is the same as
                     // the name of the type alias, recreate the type string without reusing the alias name

From d6b7c2a53317a575d5d2843bf32bb39972c4026a Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Fri, 26 Jul 2024 18:35:55 -0700
Subject: [PATCH 03/11] Fixed format errors

---
 src/compiler/checker.ts |  2 +-
 src/compiler/types.ts   | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 68350a3eb6975..a071c723c2f44 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -889,6 +889,7 @@ import {
     Node,
     NodeArray,
     NodeBuilderFlags,
+    NodeBuilderFlagsIgnoreErrors,
     nodeCanBeDecorated,
     NodeCheckFlags,
     NodeFlags,
@@ -1119,7 +1120,6 @@ import {
     WideningContext,
     WithStatement,
     YieldExpression,
-    NodeBuilderFlagsIgnoreErrors,
 } from "./_namespaces/ts.js";
 import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers.js";
 import * as performance from "./_namespaces/ts.performance.js";
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2a3fc42b0976a..932ddd969fdd9 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5474,13 +5474,12 @@ export const NodeBuilderFlags = {
     InInitialEntityName                     : 1n << 24n,    // Set when writing the LHS of an entity name or entity name expression
 }
 
-export const NodeBuilderFlagsIgnoreErrors = 
-    NodeBuilderFlags.AllowThisInObjectLiteral 
-    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier 
-    | NodeBuilderFlags.AllowAnonymousIdentifier 
-    | NodeBuilderFlags.AllowEmptyUnionOrIntersection 
-    | NodeBuilderFlags.AllowEmptyTuple 
-    | NodeBuilderFlags.AllowEmptyIndexInfoType 
+export const NodeBuilderFlagsIgnoreErrors = NodeBuilderFlags.AllowThisInObjectLiteral
+    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier
+    | NodeBuilderFlags.AllowAnonymousIdentifier
+    | NodeBuilderFlags.AllowEmptyUnionOrIntersection
+    | NodeBuilderFlags.AllowEmptyTuple
+    | NodeBuilderFlags.AllowEmptyIndexInfoType
     | NodeBuilderFlags.AllowNodeModulesRelativePaths;
 
 // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment

From 1247fcff018b8b08e0f689f178823612e773b7d5 Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Mon, 29 Jul 2024 17:57:07 -0700
Subject: [PATCH 04/11] Revert "Fixed format errors"

This reverts commit d6b7c2a53317a575d5d2843bf32bb39972c4026a.
---
 src/compiler/checker.ts |  2 +-
 src/compiler/types.ts   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index a071c723c2f44..68350a3eb6975 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -889,7 +889,6 @@ import {
     Node,
     NodeArray,
     NodeBuilderFlags,
-    NodeBuilderFlagsIgnoreErrors,
     nodeCanBeDecorated,
     NodeCheckFlags,
     NodeFlags,
@@ -1120,6 +1119,7 @@ import {
     WideningContext,
     WithStatement,
     YieldExpression,
+    NodeBuilderFlagsIgnoreErrors,
 } from "./_namespaces/ts.js";
 import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers.js";
 import * as performance from "./_namespaces/ts.performance.js";
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 932ddd969fdd9..2a3fc42b0976a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5474,12 +5474,13 @@ export const NodeBuilderFlags = {
     InInitialEntityName                     : 1n << 24n,    // Set when writing the LHS of an entity name or entity name expression
 }
 
-export const NodeBuilderFlagsIgnoreErrors = NodeBuilderFlags.AllowThisInObjectLiteral
-    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier
-    | NodeBuilderFlags.AllowAnonymousIdentifier
-    | NodeBuilderFlags.AllowEmptyUnionOrIntersection
-    | NodeBuilderFlags.AllowEmptyTuple
-    | NodeBuilderFlags.AllowEmptyIndexInfoType
+export const NodeBuilderFlagsIgnoreErrors = 
+    NodeBuilderFlags.AllowThisInObjectLiteral 
+    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier 
+    | NodeBuilderFlags.AllowAnonymousIdentifier 
+    | NodeBuilderFlags.AllowEmptyUnionOrIntersection 
+    | NodeBuilderFlags.AllowEmptyTuple 
+    | NodeBuilderFlags.AllowEmptyIndexInfoType 
     | NodeBuilderFlags.AllowNodeModulesRelativePaths;
 
 // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment

From 736ab40ebbafdcd2dfe62cbe4da33dd4b7ff1675 Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Mon, 29 Jul 2024 17:57:11 -0700
Subject: [PATCH 05/11] Revert "Fixed typos"

This reverts commit c5ffae513c66bc6bb58da66cae026a34e389eed7.
---
 src/compiler/checker.ts   | 3 ---
 src/harness/typeWriter.ts | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 68350a3eb6975..5c0b575ce88af 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -27383,9 +27383,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function isFunctionObjectType(type: ObjectType): boolean {
-        if (getObjectFlags(type) & ObjectFlags.EvolvingArray) {
-            return false;
-        }
         // We do a quick check for a "bind" property before performing the more expensive subtype
         // check. This gives us a quicker out in the common case where an object type is not a function.
         const resolved = resolveStructuredTypeMembers(type);
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 12fca9494a9c9..b413432ddd4ee 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -279,7 +279,7 @@ export class TypeWriterWalker {
             }
             else {
                 const typeFormatFlags = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType | ts.TypeFormatFlags.GenerateNamesForShadowedTypeParams;
-                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt(typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlagsIgnoreErrors)!;
+                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask)) | ts.NodeBuilderFlagsIgnoreErrors)!;
                 if (ts.isIdentifier(node) && ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node && ts.isIdentifier(typeNode) && ts.idText(typeNode) === ts.idText(node)) {
                     // for a complex type alias `type T = ...`, showing "T : T" isn't very helpful for type tests. When the type produced is the same as
                     // the name of the type alias, recreate the type string without reusing the alias name

From 585421025793d41dfdc71b196edcef44c530957b Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Mon, 29 Jul 2024 17:57:14 -0700
Subject: [PATCH 06/11] Revert "Refactored node builder flags and tests"

This reverts commit 7d434b7c78062fb9ec2949736f1dd5f8b454789d.
---
 src/compiler/checker.ts                       |  18 +-
 src/compiler/types.ts                         |  85 +-
 src/harness/typeWriter.ts                     |   4 +-
 src/services/codefixes/helpers.ts             |   2 +-
 src/services/inlayHints.ts                    |   5 +-
 src/services/signatureHelp.ts                 |   3 +-
 src/services/symbolDisplay.ts                 |   3 +-
 .../baselines/reference/ArrowFunction1.types  |   4 +-
 ...duleMemberThatUsesClassTypeParameter.types |   2 +-
 tests/baselines/reference/api/typescript.d.ts |  71 +-
 tests/baselines/reference/arguments.types     |  12 +-
 .../arrayReferenceWithoutTypeArgs.types       |   4 +-
 .../asyncAwaitIsolatedModules_es2017.types    |  24 +-
 .../asyncAwaitIsolatedModules_es5.types       |  24 +-
 .../asyncAwaitIsolatedModules_es6.types       |  24 +-
 .../badExternalModuleReference.types          |   2 +-
 .../reference/bluebirdStaticThis.types        |   2 +-
 .../reference/circularBaseTypes.types         |   4 +-
 .../reference/complicatedPrivacy.types        |   4 +-
 ...structorWithIncompleteTypeAnnotation.types |   8 +-
 ...arationEmitComputedPropertyNameEnum2.types |   8 +-
 .../errorsInGenericTypeReference.types        |  22 +-
 ...orMetadataUnresolvedTypeObjectInEmit.types |   2 +-
 ...rtSpecifierAndLocalMemberDeclaration.types |   2 +-
 ...pecifierReferencingOuterDeclaration3.types |   2 +-
 ...pecifierReferencingOuterDeclaration4.types |   2 +-
 tests/baselines/reference/extendArray.types   |   2 +-
 .../functionTypesLackingReturnTypes.types     |   2 +-
 ...nctionVariableInReturnTypeAnnotation.types |   4 +-
 ...icCallWithGenericSignatureArguments2.types |   2 +-
 ...icClassWithStaticsUsingTypeArguments.types |  12 +-
 .../genericLambaArgWithoutTypeArguments.types |   4 +-
 ...cRecursiveImplicitConstructorErrors3.types |  28 +-
 ...icTypeReferenceWithoutTypeArgument.d.types |  12 +-
 ...ericTypeReferenceWithoutTypeArgument.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument2.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument3.types |  12 +-
 .../genericsWithoutTypeParameters1.types      |  16 +-
 .../reference/importTypeGeneric.types         |   8 +-
 .../reference/importedModuleAddToGlobal.types |   2 +-
 .../reference/intrinsicKeyword.types          |   2 +-
 .../jsdocFunctionTypeFalsePositive.types      |   2 +-
 .../reference/jsdocOuterTypeParameters1.types |   6 +-
 .../jsdocParameterParsingInfiniteLoop.types   |   2 +-
 .../jsdocResolveNameFailureInTypedef.types    |   4 +-
 .../baselines/reference/lambdaArgCrash.types  |   4 +-
 tests/baselines/reference/localTypes4.types   |   2 +-
 .../reference/missingTypeArguments1.types     |   8 +-
 .../reference/missingTypeArguments2.types     |  12 +-
 ...moduleAugmentationImportsAndExports2.types |   2 +-
 ...moduleAugmentationImportsAndExports3.types |   2 +-
 .../reference/moduleExportAssignment7.types   |  12 +-
 .../reference/moduleInTypePosition1.types     |   4 +-
 ...ropertyAccessAndArrowFunctionIndent1.types |   4 +-
 .../noTypeArgumentOnReturnType1.types         |   4 +-
 ...jectTypesIdentityWithCallSignatures3.types |  12 +-
 tests/baselines/reference/parser553699.types  |   2 +-
 .../parserArrowFunctionExpression10.types     |   8 +-
 .../parserArrowFunctionExpression17.types     |   4 +-
 ...rrantEqualsGreaterThanAfterFunction2.types |   2 +-
 .../parserErrorRecovery_ParameterList6.types  |   2 +-
 .../parserGenericsInTypeContexts1.types       |   4 +-
 .../parserGenericsInTypeContexts2.types       |   4 +-
 .../parserMissingLambdaOpenBrace1.types       |   2 +-
 .../reference/parserObjectType5.types         |   2 +-
 .../reference/parserObjectType6.types         |   2 +-
 .../reference/parserRealSource10.types        | 220 ++--
 .../reference/parserRealSource11.types        | 240 ++---
 .../reference/parserRealSource12.types        | 978 +++++++++---------
 .../reference/parserRealSource13.types        | 242 ++---
 .../reference/parserRealSource14.types        |  66 +-
 .../reference/parserRealSource5.types         |   4 +-
 .../reference/parserRealSource6.types         |  66 +-
 .../reference/parserRealSource7.types         |  70 +-
 .../reference/parserRealSource8.types         |  42 +-
 .../reference/parserRealSource9.types         |  72 +-
 .../parserUnterminatedGeneric1.types          |   2 +-
 .../parserUnterminatedGeneric2.types          |   2 +-
 .../reference/parserX_ArrowFunction1.types    |   4 +-
 tests/baselines/reference/parserharness.types | 180 ++--
 .../baselines/reference/parserindenter.types  | 138 +--
 .../reference/privacyImportParseErrors.types  |  16 +-
 ...tyAssignmentMergeWithInterfaceMethod.types |   8 +-
 .../recursiveClassReferenceTest.types         |   2 +-
 .../reference/recursiveMappedTypes.types      |   4 +-
 .../reference/recursiveTypeComparison2.types  |   2 +-
 .../reference/recursiveTypeRelations.types    |   2 +-
 .../reference/returnTypeTypeArguments.types   |  88 +-
 .../baselines/reference/sourceMapSample.types |   2 +-
 .../reference/staticInstanceResolution5.types |  10 +-
 ...staticMembersUsingClassTypeParameter.types |   6 +-
 ...ethodsReferencingClassTypeParameters.types |   2 +-
 .../reference/strictModeReservedWord.types    |   6 +-
 .../baselines/reference/thisTypeErrors.types  |  80 +-
 .../reference/typeGuardFunctionErrors.types   |   8 +-
 ...ameterUsedAsTypeParameterConstraint4.types |  14 +-
 .../typeParametersInStaticAccessors.types     |   6 +-
 .../typeParametersInStaticMethods.types       |   4 +-
 .../reference/typedefTagTypeResolution.types  |   4 +-
 .../reference/typeofInObjectLiteralType.types |   4 +-
 .../reference/undeclaredModuleError.types     |   4 +-
 .../reference/undefinedTypeArgument2.types    |   2 +-
 .../unknownSymbolInGenericReturnType.types    |   4 +-
 .../baselines/reference/unknownSymbols1.types |   2 +-
 ...ionsClassMemberImportTypeNodeParameter2.ts |   2 +-
 ...ionsClassMemberImportTypeNodeParameter4.ts |   2 +-
 106 files changed, 1610 insertions(+), 1625 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5c0b575ce88af..f18a0b2a32a23 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1119,7 +1119,6 @@ import {
     WideningContext,
     WithStatement,
     YieldExpression,
-    NodeBuilderFlagsIgnoreErrors,
 } from "./_namespaces/ts.js";
 import * as moduleSpecifiers from "./_namespaces/ts.moduleSpecifiers.js";
 import * as performance from "./_namespaces/ts.performance.js";
@@ -5911,7 +5910,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags: SymbolFormatFlags = SymbolFormatFlags.AllowAnyNodeKind, writer?: EmitTextWriter): string {
-        let nodeFlags = NodeBuilderFlagsIgnoreErrors;
+        let nodeFlags = NodeBuilderFlags.IgnoreErrors;
         if (flags & SymbolFormatFlags.UseOnlyExternalAliasing) {
             nodeFlags |= NodeBuilderFlags.UseOnlyExternalAliasing;
         }
@@ -5953,7 +5952,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             else {
                 sigOutput = kind === SignatureKind.Construct ? SyntaxKind.ConstructSignature : SyntaxKind.CallSignature;
             }
-            const sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName);
+            const sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName);
             const printer = createPrinterWithRemoveCommentsOmitTrailingSemicolon();
             const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(EmitHint.Unspecified, sig!, /*sourceFile*/ sourceFile, getTrailingSemicolonDeferringWriter(writer)); // TODO: GH#18217
@@ -5962,8 +5961,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
-        const noTruncation = BigInt(compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation);
-        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None));
+        const noTruncation = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation;
+        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : 0));
         if (typeNode === undefined) return Debug.fail("should always get typenode");
         // The unresolved type gets a synthesized comment on `any` to hint to users that it's not a plain `any`.
         // Otherwise, we always strip comments out.
@@ -5998,7 +5997,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function toNodeBuilderFlags(flags = TypeFormatFlags.None): NodeBuilderFlags {
-        return BigInt(flags & TypeFormatFlags.NodeBuilderFlagsMask);
+        return flags & TypeFormatFlags.NodeBuilderFlagsMask;
     }
 
     function isClassInstanceSide(type: Type) {
@@ -6157,7 +6156,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
         function withContext<T>(enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker: SymbolTracker | undefined, cb: (context: NodeBuilderContext) => T): T | undefined {
             const moduleResolverHost = tracker?.trackSymbol ? tracker.moduleResolverHost :
-                (flags || NodeBuilderFlags.None) & NodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
+                flags! & NodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
                 undefined;
             const context: NodeBuilderContext = {
                 enclosingDeclaration,
@@ -10677,7 +10676,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return writer ? typePredicateToStringWorker(writer).getText() : usingSingleLineStringWriter(typePredicateToStringWorker);
 
         function typePredicateToStringWorker(writer: EmitTextWriter) {
-            const nodeBuilderFlags = toNodeBuilderFlags(flags) | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName;
+            const nodeBuilderFlags = toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.WriteTypeParametersInQualifiedName;
             const predicate = nodeBuilder.typePredicateToTypePredicateNode(typePredicate, enclosingDeclaration, nodeBuilderFlags)!; // TODO: GH#18217
             const printer = createPrinterWithRemoveComments();
             const sourceFile = enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration);
@@ -27383,6 +27382,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function isFunctionObjectType(type: ObjectType): boolean {
+        if (getObjectFlags(type) & ObjectFlags.EvolvingArray) {
+            return false;
+        }
         // We do a quick check for a "bind" property before performing the more expensive subtype
         // check. This gives us a quicker out in the common case where an object type is not a function.
         const resolved = resolveStructuredTypeMembers(type);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 2a3fc42b0976a..564fa64e1294c 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5427,61 +5427,52 @@ export const enum ContextFlags {
     SkipBindingPatterns = 1 << 3, // Ignore contextual types applied by binding patterns
 }
 
-export type NodeBuilderFlags = bigint;
-
 // NOTE: If modifying this enum, must modify `TypeFormatFlags` too!
 // dprint-ignore
-export const NodeBuilderFlags = {
-    None                                    : 0n,
+export const enum NodeBuilderFlags {
+    None                                    = 0,
     // Options
-    NoTruncation                            : 1n << 0n,   // Don't truncate result
-    WriteArrayAsGenericType                 : 1n << 1n,   // Write Array<T> instead T[]
-    GenerateNamesForShadowedTypeParams      : 1n << 2n,   // When a type parameter T is shadowing another T, generate a name for it so it can still be referenced
-    UseStructuralFallback                   : 1n << 3n,   // When an alias cannot be named by its symbol, rather than report an error, fallback to a structural printout if possible
-    ForbidIndexedAccessSymbolReferences     : 1n << 4n,   // Forbid references like `I["a"]["b"]` - print `typeof I.a<x>.b<y>` instead
-    WriteTypeArgumentsOfSignature           : 1n << 5n,   // Write the type arguments instead of type parameters of the signature
-    UseFullyQualifiedType                   : 1n << 6n,   // Write out the fully qualified type name (eg. Module.Type, instead of Type)
-    UseOnlyExternalAliasing                 : 1n << 7n,   // Only use external aliases for a symbol
-    SuppressAnyReturnType                   : 1n << 8n,   // If the return type is any-like and can be elided, don't offer a return type.
-    WriteTypeParametersInQualifiedName      : 1n << 9n,
-    MultilineObjectLiterals                 : 1n << 10n,  // Always write object literals across multiple lines
-    WriteClassExpressionAsTypeLiteral       : 1n << 11n,  // Write class {} as { new(): {} } - used for mixin declaration emit
-    UseTypeOfFunction                       : 1n << 12n,  // Build using typeof instead of function type literal
-    OmitParameterModifiers                  : 1n << 13n,  // Omit modifiers on parameters
-    UseAliasDefinedOutsideCurrentScope      : 1n << 14n,  // Allow non-visible aliases
-    UseSingleQuotesForStringLiteralType     : 1n << 28n,  // Use single quotes for string literal type
-    NoTypeReduction                         : 1n << 29n,  // Don't call getReducedType
-    OmitThisParameter                       : 1n << 25n,
+    NoTruncation                            = 1 << 0,   // Don't truncate result
+    WriteArrayAsGenericType                 = 1 << 1,   // Write Array<T> instead T[]
+    GenerateNamesForShadowedTypeParams      = 1 << 2,   // When a type parameter T is shadowing another T, generate a name for it so it can still be referenced
+    UseStructuralFallback                   = 1 << 3,   // When an alias cannot be named by its symbol, rather than report an error, fallback to a structural printout if possible
+    ForbidIndexedAccessSymbolReferences     = 1 << 4,   // Forbid references like `I["a"]["b"]` - print `typeof I.a<x>.b<y>` instead
+    WriteTypeArgumentsOfSignature           = 1 << 5,   // Write the type arguments instead of type parameters of the signature
+    UseFullyQualifiedType                   = 1 << 6,   // Write out the fully qualified type name (eg. Module.Type, instead of Type)
+    UseOnlyExternalAliasing                 = 1 << 7,   // Only use external aliases for a symbol
+    SuppressAnyReturnType                   = 1 << 8,   // If the return type is any-like and can be elided, don't offer a return type.
+    WriteTypeParametersInQualifiedName      = 1 << 9,
+    MultilineObjectLiterals                 = 1 << 10,  // Always write object literals across multiple lines
+    WriteClassExpressionAsTypeLiteral       = 1 << 11,  // Write class {} as { new(): {} } - used for mixin declaration emit
+    UseTypeOfFunction                       = 1 << 12,  // Build using typeof instead of function type literal
+    OmitParameterModifiers                  = 1 << 13,  // Omit modifiers on parameters
+    UseAliasDefinedOutsideCurrentScope      = 1 << 14,  // Allow non-visible aliases
+    UseSingleQuotesForStringLiteralType     = 1 << 28,  // Use single quotes for string literal type
+    NoTypeReduction                         = 1 << 29,  // Don't call getReducedType
+    OmitThisParameter                       = 1 << 25,
 
     // Error handling
-    AllowThisInObjectLiteral                : 1n << 15n,
-    AllowQualifiedNameInPlaceOfIdentifier   : 1n << 16n,
-    AllowAnonymousIdentifier                : 1n << 17n,
-    AllowEmptyUnionOrIntersection           : 1n << 18n,
-    AllowEmptyTuple                         : 1n << 19n,
-    AllowUniqueESSymbolType                 : 1n << 20n,
-    AllowEmptyIndexInfoType                 : 1n << 21n,
-    /** @internal */ WriteComputedProps      : 1n << 30n, // { [E.A]: 1 }
-    /** @internal */ NoSyntacticPrinter     : 1n << 31n,
+    AllowThisInObjectLiteral                = 1 << 15,
+    AllowQualifiedNameInPlaceOfIdentifier   = 1 << 16,
+    AllowAnonymousIdentifier                = 1 << 17,
+    AllowEmptyUnionOrIntersection           = 1 << 18,
+    AllowEmptyTuple                         = 1 << 19,
+    AllowUniqueESSymbolType                 = 1 << 20,
+    AllowEmptyIndexInfoType                 = 1 << 21,
+    /** @internal */ WriteComputedProps      = 1 << 30, // { [E.A]: 1 }
+    /** @internal */ NoSyntacticPrinter     = 1 << 31,
     // Errors (cont.)
-    AllowNodeModulesRelativePaths           : 1n << 26n,
-    /** @internal */ DoNotIncludeSymbolChain : 1n << 27n,    // Skip looking up and printing an accessible symbol chain
-    /** @internal */ AllowUnresolvedNames : 1n << 32n,
+    AllowNodeModulesRelativePaths           = 1 << 26,
+    /** @internal */ DoNotIncludeSymbolChain = 1 << 27,    // Skip looking up and printing an accessible symbol chain
+    /** @internal */ AllowUnresolvedNames = 1 << 32,
+
+    IgnoreErrors = AllowThisInObjectLiteral | AllowQualifiedNameInPlaceOfIdentifier | AllowAnonymousIdentifier | AllowEmptyUnionOrIntersection | AllowEmptyTuple | AllowEmptyIndexInfoType | AllowNodeModulesRelativePaths,
 
     // State
-    InObjectTypeLiteral                     : 1n << 22n,
-    InTypeAlias                             : 1n << 23n,    // Writing type in type alias declaration
-    InInitialEntityName                     : 1n << 24n,    // Set when writing the LHS of an entity name or entity name expression
-}
-
-export const NodeBuilderFlagsIgnoreErrors = 
-    NodeBuilderFlags.AllowThisInObjectLiteral 
-    | NodeBuilderFlags.AllowQualifiedNameInPlaceOfIdentifier 
-    | NodeBuilderFlags.AllowAnonymousIdentifier 
-    | NodeBuilderFlags.AllowEmptyUnionOrIntersection 
-    | NodeBuilderFlags.AllowEmptyTuple 
-    | NodeBuilderFlags.AllowEmptyIndexInfoType 
-    | NodeBuilderFlags.AllowNodeModulesRelativePaths;
+    InObjectTypeLiteral                     = 1 << 22,
+    InTypeAlias                             = 1 << 23,    // Writing type in type alias declaration
+    InInitialEntityName                     = 1 << 24,    // Set when writing the LHS of an entity name or entity name expression
+}
 
 // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment
 // dprint-ignore
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index b413432ddd4ee..e09f8bd56a272 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -279,11 +279,11 @@ export class TypeWriterWalker {
             }
             else {
                 const typeFormatFlags = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType | ts.TypeFormatFlags.GenerateNamesForShadowedTypeParams;
-                let typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask)) | ts.NodeBuilderFlagsIgnoreErrors)!;
+                let typeNode = this.checker.typeToTypeNode(type, node.parent, (typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors)!;
                 if (ts.isIdentifier(node) && ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node && ts.isIdentifier(typeNode) && ts.idText(typeNode) === ts.idText(node)) {
                     // for a complex type alias `type T = ...`, showing "T : T" isn't very helpful for type tests. When the type produced is the same as
                     // the name of the type alias, recreate the type string without reusing the alias name
-                    typeNode = this.checker.typeToTypeNode(type, node.parent, BigInt((typeFormatFlags | ts.TypeFormatFlags.InTypeAlias) & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlagsIgnoreErrors)!;
+                    typeNode = this.checker.typeToTypeNode(type, node.parent, ((typeFormatFlags | ts.TypeFormatFlags.InTypeAlias) & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors)!;
                 }
 
                 const { printer, writer, underliner, reset } = createSyntheticNodeUnderliningPrinter();
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 3185d2697ed61..0524080520582 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -221,7 +221,7 @@ export function addNewNodeForMemberSymbol(
         case SyntaxKind.PropertySignature:
         case SyntaxKind.PropertyDeclaration:
             let flags = NodeBuilderFlags.NoTruncation;
-            flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : NodeBuilderFlags.None;
+            flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : 0;
             let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (importAdder) {
                 const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
diff --git a/src/services/inlayHints.ts b/src/services/inlayHints.ts
index bd5d7dde8d1d9..ce779052a053a 100644
--- a/src/services/inlayHints.ts
+++ b/src/services/inlayHints.ts
@@ -102,7 +102,6 @@ import {
     Node,
     NodeArray,
     NodeBuilderFlags,
-    NodeBuilderFlagsIgnoreErrors,
     ParameterDeclaration,
     PrefixUnaryExpression,
     PropertyDeclaration,
@@ -465,7 +464,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
     }
 
     function printTypeInSingleLine(type: Type) {
-        const flags = NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+        const flags = NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
         const printer = createPrinterWithRemoveComments();
 
         return usingSingleLineStringWriter(writer => {
@@ -480,7 +479,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
             return printTypeInSingleLine(type);
         }
 
-        const flags = NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+        const flags = NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.AllowUniqueESSymbolType | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
         const typeNode = checker.typeToTypeNode(type, /*enclosingDeclaration*/ undefined, flags);
         Debug.assertIsDefined(typeNode, "should always get typenode");
 
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
index 370190c7a462b..70e9174e64a60 100644
--- a/src/services/signatureHelp.ts
+++ b/src/services/signatureHelp.ts
@@ -64,7 +64,6 @@ import {
     mapToDisplayParts,
     Node,
     NodeBuilderFlags,
-    NodeBuilderFlagsIgnoreErrors,
     ParameterDeclaration,
     ParenthesizedExpression,
     Printer,
@@ -644,7 +643,7 @@ function getEnclosingDeclarationFromInvocation(invocation: Invocation): Node {
     return invocation.kind === InvocationKind.Call ? invocation.node : invocation.kind === InvocationKind.TypeArgs ? invocation.called : invocation.node;
 }
 
-const signatureHelpNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+const signatureHelpNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
 function createSignatureHelpItems(
     candidates: readonly Signature[],
     resolvedSignature: Signature,
diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts
index ffa6fab6afc4b..5ba8170b17b32 100644
--- a/src/services/symbolDisplay.ts
+++ b/src/services/symbolDisplay.ts
@@ -75,7 +75,6 @@ import {
     NewExpression,
     Node,
     NodeBuilderFlags,
-    NodeBuilderFlagsIgnoreErrors,
     ObjectFlags,
     operatorPart,
     PropertyAccessExpression,
@@ -111,7 +110,7 @@ import {
     VariableDeclaration,
 } from "./_namespaces/ts.js";
 
-const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlagsIgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
+const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
 
 // TODO(drosen): use contextual SemanticMeaning.
 /** @internal */
diff --git a/tests/baselines/reference/ArrowFunction1.types b/tests/baselines/reference/ArrowFunction1.types
index c0f36308a4c3a..e05ceb280edb9 100644
--- a/tests/baselines/reference/ArrowFunction1.types
+++ b/tests/baselines/reference/ArrowFunction1.types
@@ -3,9 +3,9 @@
 === ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>  : ^ ^^   ^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^^^^^^^^^^^^^
+>               : ^ ^^   ^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
index 3b9a05088c0b9..9bce00088aa1c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
@@ -22,7 +22,7 @@ module clodule1 {
 
     function f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 7b46acd91acdd..8275e4222820c 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -6274,44 +6274,39 @@ declare namespace ts {
          */
         runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
     }
-    type NodeBuilderFlags = bigint;
-    const NodeBuilderFlags: {
-        None: bigint;
-        NoTruncation: bigint;
-        WriteArrayAsGenericType: bigint;
-        GenerateNamesForShadowedTypeParams: bigint;
-        UseStructuralFallback: bigint;
-        ForbidIndexedAccessSymbolReferences: bigint;
-        WriteTypeArgumentsOfSignature: bigint;
-        UseFullyQualifiedType: bigint;
-        UseOnlyExternalAliasing: bigint;
-        SuppressAnyReturnType: bigint;
-        WriteTypeParametersInQualifiedName: bigint;
-        MultilineObjectLiterals: bigint;
-        WriteClassExpressionAsTypeLiteral: bigint;
-        UseTypeOfFunction: bigint;
-        OmitParameterModifiers: bigint;
-        UseAliasDefinedOutsideCurrentScope: bigint;
-        UseSingleQuotesForStringLiteralType: bigint;
-        NoTypeReduction: bigint;
-        OmitThisParameter: bigint;
-        AllowThisInObjectLiteral: bigint;
-        AllowQualifiedNameInPlaceOfIdentifier: bigint;
-        AllowAnonymousIdentifier: bigint;
-        AllowEmptyUnionOrIntersection: bigint;
-        AllowEmptyTuple: bigint;
-        AllowUniqueESSymbolType: bigint;
-        AllowEmptyIndexInfoType: bigint;
-        /** @internal */ WriteComputedProps: bigint;
-        /** @internal */ NoSyntacticPrinter: bigint;
-        AllowNodeModulesRelativePaths: bigint;
-        /** @internal */ DoNotIncludeSymbolChain: bigint;
-        /** @internal */ AllowUnresolvedNames: bigint;
-        InObjectTypeLiteral: bigint;
-        InTypeAlias: bigint;
-        InInitialEntityName: bigint;
-    };
-    const NodeBuilderFlagsIgnoreErrors: bigint;
+    enum NodeBuilderFlags {
+        None = 0,
+        NoTruncation = 1,
+        WriteArrayAsGenericType = 2,
+        GenerateNamesForShadowedTypeParams = 4,
+        UseStructuralFallback = 8,
+        ForbidIndexedAccessSymbolReferences = 16,
+        WriteTypeArgumentsOfSignature = 32,
+        UseFullyQualifiedType = 64,
+        UseOnlyExternalAliasing = 128,
+        SuppressAnyReturnType = 256,
+        WriteTypeParametersInQualifiedName = 512,
+        MultilineObjectLiterals = 1024,
+        WriteClassExpressionAsTypeLiteral = 2048,
+        UseTypeOfFunction = 4096,
+        OmitParameterModifiers = 8192,
+        UseAliasDefinedOutsideCurrentScope = 16384,
+        UseSingleQuotesForStringLiteralType = 268435456,
+        NoTypeReduction = 536870912,
+        OmitThisParameter = 33554432,
+        AllowThisInObjectLiteral = 32768,
+        AllowQualifiedNameInPlaceOfIdentifier = 65536,
+        AllowAnonymousIdentifier = 131072,
+        AllowEmptyUnionOrIntersection = 262144,
+        AllowEmptyTuple = 524288,
+        AllowUniqueESSymbolType = 1048576,
+        AllowEmptyIndexInfoType = 2097152,
+        AllowNodeModulesRelativePaths = 67108864,
+        IgnoreErrors = 70221824,
+        InObjectTypeLiteral = 4194304,
+        InTypeAlias = 8388608,
+        InInitialEntityName = 16777216,
+    }
     enum TypeFormatFlags {
         None = 0,
         NoTruncation = 1,
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index 23e3bcd89500f..e0920ba869bb1 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -38,16 +38,16 @@ function f() {
 
 interface I {
     method(args: typeof arguments): void;
->method : (args: any) => void
->       : ^    ^^^^^^^^^^    
+>method : (args: typeof arguments) => void
+>       : ^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
 >          : ^^^
 
     fn: (args: typeof arguments) => void;
->fn : (args: any) => void
->   : ^    ^^^^^^^^^^    
+>fn : (args: typeof arguments) => void
+>   : ^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
@@ -66,8 +66,8 @@ interface I {
 >          : ^^^
 
     construct: new (args: typeof arguments) => void;
->construct : new (args: any) => void
->          : ^^^^^    ^^^^^^^^^^    
+>construct : new (args: typeof arguments) => void
+>          : ^^^^^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
index 1986b06942f71..3477e908a4412 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
@@ -6,8 +6,8 @@ class X {
 >  : ^
 
     public f(a: Array) { }
->f : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>f : (a: Array) => void
+>  : ^ ^^     ^^^^^^^^^
 >a : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
index 5c6b02e6e38ea..2059b6a1d0af5 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
index 82694aa672ecf..c67538371823d 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
index 1e9e5af30123a..b69055519df93 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/badExternalModuleReference.types b/tests/baselines/reference/badExternalModuleReference.types
index e2161d64ff872..755cfd5afa70b 100644
--- a/tests/baselines/reference/badExternalModuleReference.types
+++ b/tests/baselines/reference/badExternalModuleReference.types
@@ -7,7 +7,7 @@ import a1 = require("garbage");
 
 export declare var a: {
 >a : { (): a1.connectExport; test1: a1.connectModule; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^                ^^^^^^^^^                ^^^
 
     test1: a1.connectModule;
 >test1 : a1.connectModule
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index cc2b3a9a5c1c1..e090eac053745 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -147,7 +147,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
 >defer : <R>(dit: typeof Promise) => Promise.Resolver<R>
->      : ^ ^^   ^^              ^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^ ^^   ^^              ^^^^^                   
 >dit : typeof Promise
 >    : ^^^^^^^^^^^^^^
 >Promise : typeof Promise
diff --git a/tests/baselines/reference/circularBaseTypes.types b/tests/baselines/reference/circularBaseTypes.types
index 9b237c0c33002..f15db1ed5a721 100644
--- a/tests/baselines/reference/circularBaseTypes.types
+++ b/tests/baselines/reference/circularBaseTypes.types
@@ -15,8 +15,8 @@ type M3 = M2[keyof M2];  // Error
 >   : ^^^
 
 function f(m: M3) {
->f : (m: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (m: M3) => any
+>  : ^ ^^  ^^^^^^^^
 >m : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index 4b8e2b93060cb..d9fd54eb04428 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -84,8 +84,8 @@ module m1 {
     }
 
     export function f4(arg1: 
->f4 : (arg1: {}) => void
->   : ^    ^^  ^^^^^^^^^
+>f4 : (arg1: { [number]: C1; }) => void
+>   : ^    ^^                 ^^^^^^^^^
 >arg1 : {}
 >     : ^^
     {
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 07ec406a76ef9..1732ef9e66df6 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -859,11 +859,11 @@ module TypeScriptAllInOne {
 >xx.Foo() : bool
 >         : ^^^^
 >xx.Foo : () => bool
->       : ^^^^^^^^^^
+>       : ^^^^^^    
 >xx : IF
 >   : ^^
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
 >0 : 0
 >  : ^
 >1 : 1
@@ -1290,7 +1290,7 @@ module TypeScriptAllInOne {
     interface IF {
         Foo(): bool;
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
     }
 
     class CLASS implements IF {
@@ -1323,7 +1323,7 @@ module TypeScriptAllInOne {
         }
         public Foo(): bool {
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
 
             var myEvent = () => { return 1; };
 >myEvent : () => number
diff --git a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
index ff27f866ca994..1e5e4b1c668a0 100644
--- a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
+++ b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
@@ -21,10 +21,10 @@ import { type Type } from "./type";
 >     : ^^^
 
 export const foo = { ...({} as Type) };
->foo : { x?: {}; }
->    : ^^^^^^  ^^^
->{ ...({} as Type) } : { x?: {}; }
->                    : ^^^^^^  ^^^
+>foo : { x?: { [Enum.A]: 0; }; }
+>    : ^^^^^^                ^^^
+>{ ...({} as Type) } : { x?: { [Enum.A]: 0; }; }
+>                    : ^^^^^^                ^^^
 >({} as Type) : Type
 >             : ^^^^
 >{} as Type : Type
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types
index 81f1035e5f2c0..c159268c6c1fe 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.types
+++ b/tests/baselines/reference/errorsInGenericTypeReference.types
@@ -45,9 +45,9 @@ class testClass2<T> {
 }
 var tc2 = new testClass2<{ x: V }>(); // error: could not find symbol V
 >tc2 : testClass2<{ x: V; }>
->    : ^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^^^^^^^^^^^ ^^^^
 >new testClass2<{ x: V }>() : testClass2<{ x: V; }>
->                           : ^^^^^^^^^^^^^^^^^^^^^
+>                           : ^^^^^^^^^^^^^^^^ ^^^^
 >testClass2 : typeof testClass2
 >           : ^^^^^^^^^^^^^^^^^
 >x : V
@@ -73,15 +73,15 @@ class testClass3 {
 
     set a(value: Foo<{ x: V }>) { } // error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >value : Foo<{ x: V; }>
->      : ^^^^^^^^^^^^^^
+>      : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^^^^^^
+>         : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 }
@@ -100,7 +100,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 >testFunction2 : (p: Foo<{ x: V; }>) => void
 >              : ^ ^^              ^^^^^^^^^
 >p : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -108,7 +108,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 // in var type annotation
 var f: Foo<{ x: V }>; // error: could not find symbol V
 >f : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -149,7 +149,7 @@ class testClass7 extends Foo<{ x: V }> { } // error: could not find symbol V
 >testClass7 : testClass7
 >           : ^^^^^^^^^^
 >Foo : Foo<{ x: V; }>
->    : ^^^^^^^^^^^^^^
+>    : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -166,7 +166,7 @@ class testClass8 implements IFoo<{ x: V }> { } // error: could not find symbol V
 interface testInterface2 {
     new (a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 >x : V
@@ -182,7 +182,7 @@ interface testInterface2 {
 >method : (a: Foo<{ x: V; }>) => Foo<{ x: V; }>
 >       : ^ ^^              ^^^^^              
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 >x : V
@@ -190,7 +190,7 @@ interface testInterface2 {
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^^^^^^
+>         : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 }
diff --git a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
index e92435770566b..03d26bb153cbd 100644
--- a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
+++ b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
@@ -17,7 +17,7 @@ class Foo {
 
     f(@decorate user: A.B.C.D.E): void {}
 >f : (user: A.B.C.D.E) => void
->  : ^    ^^^^^^^^^^^^^^^^    
+>  : ^    ^^         ^^^^^    
 >decorate : any
 >         : ^^^
 >user : A.B.C.D.E
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 1166e17b3ee19..45c953a6edaec 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -31,7 +31,7 @@ declare module "m2" {
 
     function Z2(): X.I;
 >Z2 : () => X.I
->   : ^^^^^^^^^
+>   : ^^^^^^   
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index 6479046c76e2e..7cfc7f29a1799 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -19,7 +19,7 @@ declare module "m" {
 
     export function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^^^^^^
+>    : ^^^^^^     
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
index 5bd8e94d07540..6abf489b85771 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
@@ -18,7 +18,7 @@ export declare function foo(): X.foo;
 
 export declare function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^^^^^^
+>    : ^^^^^^     
 >X : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types
index 4278407983217..0cc9fc76332e3 100644
--- a/tests/baselines/reference/extendArray.types
+++ b/tests/baselines/reference/extendArray.types
@@ -36,7 +36,7 @@ declare module _Core {
 >collect : (fn: (e: _element) => _element[]) => any[]
 >        : ^  ^^                           ^^^^^     
 >fn : (e: _element) => _element[]
->   : ^ ^^^^^^^^^^^^^^^          
+>   : ^ ^^        ^^^^^          
 >e : _element
 >  : ^^^^^^^^
   }
diff --git a/tests/baselines/reference/functionTypesLackingReturnTypes.types b/tests/baselines/reference/functionTypesLackingReturnTypes.types
index 1daafaa5f397a..eee1024a9b1d5 100644
--- a/tests/baselines/reference/functionTypesLackingReturnTypes.types
+++ b/tests/baselines/reference/functionTypesLackingReturnTypes.types
@@ -6,7 +6,7 @@ function f(x: ()) {
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^^^^
+>  : ^^^^^^   
 }
 
 // Error (no '=>')
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
index e09690cad7040..a411dc6efcaa1 100644
--- a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
@@ -2,8 +2,8 @@
 
 === functionVariableInReturnTypeAnnotation.ts ===
 function bar(): typeof b {
->bar : () => any
->    : ^^^^^^^^^
+>bar : () => typeof b
+>    : ^^^^^^        
 >b : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index 6dfc4569d313d..09fe11a54013c 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -435,7 +435,7 @@ module TU {
 >x : T
 >  : ^
 >b : (x: U) => U
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^ 
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
index 94966b98ecdd6..673dd58110312 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
@@ -8,9 +8,9 @@ class Foo<T> {
 
     static a = (n: T) => { };
 >a : (n: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >(n: T) => { } : (n: T) => void
->              : ^ ^^^^^^^^^^^^
+>              : ^ ^^ ^^^^^^^^^
 >n : T
 >  : ^
 
@@ -34,9 +34,9 @@ class Foo<T> {
 >((x: T) => x || undefined)(null) : any
 >                                 : ^^^
 >((x: T) => x || undefined) : (x: T) => any
->                           : ^ ^^^^^^^^^^^
+>                           : ^ ^^ ^^^^^^^^
 >(x: T) => x || undefined : (x: T) => any
->                         : ^ ^^^^^^^^^^^
+>                         : ^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 >x || undefined : any
@@ -48,9 +48,9 @@ class Foo<T> {
 
     static e = function (x: T) { return null; }
 >e : (x: T) => any
->  : ^ ^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^
 >function (x: T) { return null; } : (x: T) => any
->                                 : ^ ^^^^^^^^^^^
+>                                 : ^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
index 5d3d5fe11f6e9..7aad01faad3f2 100644
--- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
@@ -19,8 +19,8 @@ foo((arg: Foo) => { return arg.x; });
 >                                     : ^^^
 >foo : (a: any) => any
 >    : ^ ^^^^^^^^^^^^^
->(arg: Foo) => { return arg.x; } : (arg: any) => any
->                                : ^   ^^^^^^^^^^^^^
+>(arg: Foo) => { return arg.x; } : (arg: Foo) => any
+>                                : ^   ^^   ^^^^^^^^
 >arg : any
 >    : ^^^
 >arg.x : any
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
index 7af45bae740c9..74f654b1a760e 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
@@ -10,8 +10,8 @@ module TypeScript {
 >           : ^^^^^^^^^^^^^^^^^^^
 
         static create<A,B,C>(arg1: any, arg2?: any, arg3?: any): MemberName {
->create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => any
->       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >arg1 : any
 >     : ^^^
 >arg2 : any
@@ -45,8 +45,8 @@ module TypeScript {
 >             : ^^^
 
         public toString<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) {
->toString : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean) => any
->         : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^^^^^^^
+>toString : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) => any
+>         : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -61,12 +61,12 @@ module TypeScript {
 >                                                                : ^^^
 >this.getScopedNameEx(scopeSymbol, useConstraintInName) : any
 >                                                       : ^^^
->this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                     : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                     : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >this : this
 >     : ^^^^
->getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -79,8 +79,8 @@ module TypeScript {
 >  : ^^^
         }
         public getScopedNameEx<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) {
->getScopedNameEx : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -191,12 +191,12 @@ module TypeScript {
                 return MemberName.create(elementMemberName, "", "[]");
 >MemberName.create(elementMemberName, "", "[]") : any
 >                                               : ^^^
->MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
->                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >MemberName : typeof MemberName
 >           : ^^^^^^^^^^^^^^^^^
->create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
->       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >elementMemberName : any
 >                  : ^^^
 >"" : ""
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
index b8d61e618b3d4..7d12f8b399ff6 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
index 428b8ad4ca384..b289f43a0a8db 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
@@ -18,14 +18,14 @@ var c: C;
 >  : ^^^
 
 var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,10 +36,10 @@ var d: { [x: C]: C };
 >  : ^^^
 
 var e = (x: C) => { var y: C; return y; }
->e : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->(x: C) => { var y: C; return y; } : (x: any) => any
->                                  : ^ ^^^^^^^^^^^^^
+>e : (x: C) => any
+>  : ^ ^^ ^^^^^^^^
+>(x: C) => { var y: C; return y; } : (x: C) => any
+>                                  : ^ ^^ ^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -48,8 +48,8 @@ var e = (x: C) => { var y: C; return y; }
 >  : ^^^
 
 function f(x: C): C { var y: C; return y; }
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
@@ -58,12 +58,12 @@ function f(x: C): C { var y: C; return y; }
 >  : ^^^
 
 var g = function f(x: C): C { var y: C; return y; }
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->function f(x: C): C { var y: C; return y; } : (x: any) => any
->                                            : ^ ^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: C) => C
+>  : ^ ^^ ^^^^^ 
+>function f(x: C): C { var y: C; return y; } : (x: C) => C
+>                                            : ^ ^^ ^^^^^ 
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
index d618ec2c442c3..02c324df4a2ba 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
@@ -15,14 +15,14 @@ var c: I;
 >  : ^^^
 
 var a: { x: I };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: I; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 var b: { (x: I): I };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -33,10 +33,10 @@ var d: { [x: I]: I };
 >  : ^^^
 
 var e = (x: I) => { var y: I; return y; }
->e : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->(x: I) => { var y: I; return y; } : (x: any) => any
->                                  : ^ ^^^^^^^^^^^^^
+>e : (x: I) => any
+>  : ^ ^^ ^^^^^^^^
+>(x: I) => { var y: I; return y; } : (x: I) => any
+>                                  : ^ ^^ ^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -45,8 +45,8 @@ var e = (x: I) => { var y: I; return y; }
 >  : ^^^
 
 function f(x: I): I { var y: I; return y; }
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
@@ -55,12 +55,12 @@ function f(x: I): I { var y: I; return y; }
 >  : ^^^
 
 var g = function f(x: I): I { var y: I; return y; }
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->function f(x: I): I { var y: I; return y; } : (x: any) => any
->                                            : ^ ^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: I) => I
+>  : ^ ^^ ^^^^^ 
+>function f(x: I): I { var y: I; return y; } : (x: I) => I
+>                                            : ^ ^^ ^^^^^ 
+>f : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
index 65c8e58e17514..1b4e7fc2df006 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.types b/tests/baselines/reference/genericsWithoutTypeParameters1.types
index 37257696d399b..d53f00d368de8 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.types
@@ -33,8 +33,8 @@ var i2: I<C>;
 >   : ^^^^^^
 
 function foo(x: C, y: I) { }
->foo : (x: any, y: any) => void
->    : ^ ^^^^^^^ ^^^^^^^^^^^^^^
+>foo : (x: C, y: I) => void
+>    : ^ ^^ ^^ ^^ ^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -49,8 +49,8 @@ function foo2(x: C<I>, y: I<C>) { }
 >  : ^^^^^^
 
 var x: { a: C } = { a: new C<number>() };
->x : { a: any; }
->  : ^^^^^^^^^^^
+>x : { a: C; }
+>  : ^^^^^ ^^^
 >a : any
 >  : ^^^
 >{ a: new C<number>() } : { a: C<number>; }
@@ -63,8 +63,8 @@ var x: { a: C } = { a: new C<number>() };
 >  : ^^^^^^^^
 
 var x2: { a: I } = { a: { bar() { return 1 } } };
->x2 : { a: any; }
->   : ^^^^^^^^^^^
+>x2 : { a: I; }
+>   : ^^^^^ ^^^
 >a : any
 >  : ^^^
 >{ a: { bar() { return 1 } } } : { a: { bar(): number; }; }
@@ -106,8 +106,8 @@ class A<T> { }
 >  : ^^^^
 
 function f<T>(x: T): A {
->f : <T>(x: T) => any
->  : ^ ^^ ^^ ^^^^^^^^
+>f : <T>(x: T) => A
+>  : ^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/importTypeGeneric.types b/tests/baselines/reference/importTypeGeneric.types
index 80bda6bda5986..89f99fcf06016 100644
--- a/tests/baselines/reference/importTypeGeneric.types
+++ b/tests/baselines/reference/importTypeGeneric.types
@@ -14,8 +14,8 @@ export interface Foo {
 }
 === usage.ts ===
 export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
->getFooFrom : <T extends "./a" | "./b">(v: T) => any
->           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
+>getFooFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo
+>           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^             
 >v : T
 >  : ^
 
@@ -27,8 +27,8 @@ export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 }
 
 export function getFooValueFrom<T extends "./a" | "./b">(v: T): import(T).Foo["a"] {
->getFooValueFrom : <T extends "./a" | "./b">(v: T) => any
->                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
+>getFooValueFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo["a"]
+>                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^                  
 >v : T
 >  : ^
 
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types
index 4595882098610..f935bc74710e4 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.types
+++ b/tests/baselines/reference/importedModuleAddToGlobal.types
@@ -44,7 +44,7 @@ module C {
 
     function hello(): b.B { return null; }
 >hello : () => b.B
->      : ^^^^^^^^^
+>      : ^^^^^^   
 >b : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/intrinsicKeyword.types b/tests/baselines/reference/intrinsicKeyword.types
index 992bddd32605f..ae043729da5d0 100644
--- a/tests/baselines/reference/intrinsicKeyword.types
+++ b/tests/baselines/reference/intrinsicKeyword.types
@@ -7,7 +7,7 @@ let e1: intrinsic;
 
 let e2: { intrinsic: intrinsic };
 >e2 : { intrinsic: intrinsic; }
->   : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^^^^^^^^         ^^^
 >intrinsic : intrinsic
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
index cc6fd4db7284d..cbfbd71f3ce4b 100644
--- a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
+++ b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
@@ -6,5 +6,5 @@ function f(x) {}
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^^^^
+>  : ^^^^^^   
 
diff --git a/tests/baselines/reference/jsdocOuterTypeParameters1.types b/tests/baselines/reference/jsdocOuterTypeParameters1.types
index 104c89b19a52e..e09bc426c3e91 100644
--- a/tests/baselines/reference/jsdocOuterTypeParameters1.types
+++ b/tests/baselines/reference/jsdocOuterTypeParameters1.types
@@ -4,9 +4,9 @@
 /** @return {T} */
 const dedupingMixin = function(mixin) {};
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^^
+>              : ^     ^^^^^^^^^^ 
 >function(mixin) {} : (mixin: any) => T
->                   : ^     ^^^^^^^^^^^
+>                   : ^     ^^^^^^^^^^ 
 >mixin : any
 >      : ^^^
 
@@ -17,7 +17,7 @@ const PropertyAccessors = dedupingMixin(() => {
 >dedupingMixin(() => {  class Bar {    static bar() { this.prototype.foo(); }  }}) : T
 >                                                                                  : ^
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^^
+>              : ^     ^^^^^^^^^^ 
 >() => {  class Bar {    static bar() { this.prototype.foo(); }  }} : () => void
 >                                                                   : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
index 60aba05e6ac88..03e0733209e4e 100644
--- a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
+++ b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
@@ -7,5 +7,5 @@
  */
 let x;
 >x : (arg0: any, arg1: foo) => any
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^   ^^^^^^^^   ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
index 7e9a79fe8921a..fa4c2be52ec06 100644
--- a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
+++ b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
@@ -5,8 +5,8 @@
  * @param {Ty} x
  */
 function f(x) {}
->f : (x: CantResolveThis) => void
->  : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>f : (x: Ty) => void
+>  : ^ ^^  ^^^^^^^^^
 >x : CantResolveThis
 >  : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/lambdaArgCrash.types b/tests/baselines/reference/lambdaArgCrash.types
index b04d53e722cd8..2905a3006e235 100644
--- a/tests/baselines/reference/lambdaArgCrash.types
+++ b/tests/baselines/reference/lambdaArgCrash.types
@@ -69,7 +69,7 @@ class ItemSetEvent extends Event {
 >add : (listener: (items: ItemSet) => void) => void
 >    : ^        ^^                        ^^^^^^^^^
 >listener : (items: ItemSet) => void
->         : ^     ^^^^^^^^^^^^^^    
+>         : ^     ^^       ^^^^^    
 >items : ItemSet
 >      : ^^^^^^^
 
@@ -83,7 +83,7 @@ class ItemSetEvent extends Event {
 >add : (listener: () => any) => void
 >    : ^        ^^         ^^^^^    
 >listener : (items: ItemSet) => void
->         : ^     ^^^^^^^^^^^^^^    
+>         : ^     ^^       ^^^^^    
 
 	}
 
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index 276995eccc15c..bab7b13a03a3b 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -25,7 +25,7 @@ function f2() {
     // Local types are not in scope in parameters and return types
     function f(x: T): T {
 >f : (x: T) => T
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^ 
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/missingTypeArguments1.types b/tests/baselines/reference/missingTypeArguments1.types
index 7674a030f35cc..4c52121e6efdb 100644
--- a/tests/baselines/reference/missingTypeArguments1.types
+++ b/tests/baselines/reference/missingTypeArguments1.types
@@ -11,8 +11,8 @@ class X<T> {
 >  : ^^^^
 
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 }
 var a: X<number>;
 >a : X<number>
@@ -73,8 +73,8 @@ class X6<T> {
 >   : ^^^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 }
 var a6: X6<number>;
 >a6 : X6<number>
diff --git a/tests/baselines/reference/missingTypeArguments2.types b/tests/baselines/reference/missingTypeArguments2.types
index c5c87c749a5ef..7e209f39c7ca0 100644
--- a/tests/baselines/reference/missingTypeArguments2.types
+++ b/tests/baselines/reference/missingTypeArguments2.types
@@ -6,12 +6,12 @@ class A<T> { }
 >  : ^^^^
 
 var x: () => A;
->x : () => any
->  : ^^^^^^^^^
+>x : () => A
+>  : ^^^^^^ 
 
 (a: A) => { };
->(a: A) => { } : (a: any) => void
->              : ^ ^^^^^^^^^^^^^^
+>(a: A) => { } : (a: A) => void
+>              : ^ ^^ ^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -20,6 +20,6 @@ var y: A<A>;
 >  : ^^^^^^
 
 (): A => null;
->(): A => null : () => any
->              : ^^^^^^^^^
+>(): A => null : () => A
+>              : ^^^^^^ 
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index 088b4523199a2..f120426e0aa12 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -80,7 +80,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^^
+>    : ^^^^^^ 
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 8e0116c6d7fe1..17d9fc3f6e23e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -75,7 +75,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^^
+>    : ^^^^^^ 
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleExportAssignment7.types b/tests/baselines/reference/moduleExportAssignment7.types
index 2ccb64f0d5d12..4124a6d377230 100644
--- a/tests/baselines/reference/moduleExportAssignment7.types
+++ b/tests/baselines/reference/moduleExportAssignment7.types
@@ -159,8 +159,8 @@ function jstypes(a, b, c, d, e, f, g) {
  * @param {typeof import("./mod").literal} g
  */
 function jsvalues(a, b, c, d, e, f, g) {
->jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
->         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
+>jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
+>         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
 >a : typeof Thing
 >  : ^^^^^^^^^^^^
 >b : typeof AnotherThing
@@ -227,8 +227,8 @@ function jsvalues(a, b, c, d, e, f, g) {
 
 === index.ts ===
 function types(
->types : (a: any, b: any, c: any, d: any, e: any, f: import("./mod").buz, g: any) => any
->      : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^                   ^^ ^^^^^^^^^^^^^
+>types : (a: import("./mod").Thing, b: import("./mod").AnotherThing, c: import("./mod").foo, d: import("./mod").qux, e: import("./mod").baz, f: import("./mod").buz, g: import("./mod").literal) => any
+>      : ^ ^^                     ^^ ^^                            ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                       ^^^^^^^^
 
     a: import('./mod').Thing,
 >a : any
@@ -309,8 +309,8 @@ function types(
 }
 
 function values(
->values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
->       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
+>values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
+>       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
 
     a: typeof import('./mod').Thing,
 >a : typeof Thing
diff --git a/tests/baselines/reference/moduleInTypePosition1.types b/tests/baselines/reference/moduleInTypePosition1.types
index 54a4064d3a58d..893230662904c 100644
--- a/tests/baselines/reference/moduleInTypePosition1.types
+++ b/tests/baselines/reference/moduleInTypePosition1.types
@@ -8,9 +8,9 @@ import WinJS = require('./moduleInTypePosition1_0');
 
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^^^^^^^^^^^^^^^
+>                   : ^  ^^     ^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
index 689b28d1d837e..ab36f42fb2ec6 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
@@ -21,7 +21,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(role: Role) =>        this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : (role: Role) => any
->                                                                                                                          : ^    ^^^^^^^^^^^^^^
+>                                                                                                                          : ^    ^^    ^^^^^^^^
 >role : Role
 >     : ^^^^
 
@@ -49,7 +49,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(data: ng.IHttpPromiseCallbackArg<Role>) => data.data : (data: ng.IHttpPromiseCallbackArg<Role>) => any
->                                                      : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                      : ^    ^^                                ^^^^^^^^
 >data : ng.IHttpPromiseCallbackArg<Role>
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ng : any
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.types b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
index 11c001306ea4f..aa78989a9c06c 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.types
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
@@ -6,8 +6,8 @@ class A<T>{
 >  : ^^^^
  
  foo(): A{
->foo : () => any
->    : ^^^^^^^^^
+>foo : () => A
+>    : ^^^^^^ 
 
   return null;
  }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
index 9e3db23d9d6c5..e5b849c6a2add 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
@@ -62,24 +62,24 @@ function foo3(x: any) { }
 >  : ^^^
 
 function foo4(x: typeof b);
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: typeof b); // error
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: any) { }
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/parser553699.types b/tests/baselines/reference/parser553699.types
index 8fb75c3898941..fcc70394c1163 100644
--- a/tests/baselines/reference/parser553699.types
+++ b/tests/baselines/reference/parser553699.types
@@ -8,7 +8,7 @@ class Foo {
   constructor() { }
   public banana (x: public) { }
 >banana : (x: public) => void
->       : ^ ^^^^^^^^^^^^^^^^^
+>       : ^ ^^      ^^^^^^^^^
 >x : public
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.types b/tests/baselines/reference/parserArrowFunctionExpression10.types
index 0b639062c960d..bc288ad26b247 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression10.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression10.types
@@ -3,11 +3,11 @@
 === fileJs.js ===
 a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colon
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^^
+>                            : ^ ^^^^^^^^^^ 
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^^
+>               : ^ ^^^^^^^^^^ 
 >b : any
 >  : ^^^
 >(d) : any
@@ -24,11 +24,11 @@ a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colo
 === fileTs.ts ===
 a ? (b) : c => (d) : e => f
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^^
+>                            : ^ ^^^^^^^^^^ 
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^^
+>               : ^ ^^^^^^^^^^ 
 >b : any
 >  : ^^^
 >(d) : any
diff --git a/tests/baselines/reference/parserArrowFunctionExpression17.types b/tests/baselines/reference/parserArrowFunctionExpression17.types
index 44f811dbf5975..72350d6f59991 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression17.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression17.types
@@ -9,7 +9,7 @@ a ? b : (c) : d => e // Not legal JS; "Unexpected token ':'" at last colon
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^^
+>             : ^ ^^^^^^^^^^ 
 >c : any
 >  : ^^^
 >e : any
@@ -24,7 +24,7 @@ a ? b : (c) : d => e
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^^
+>             : ^ ^^^^^^^^^^ 
 >c : any
 >  : ^^^
 >e : any
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
index c081e3e394ad1..b1e08f535a2e3 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
@@ -3,7 +3,7 @@
 === parserErrantEqualsGreaterThanAfterFunction2.ts ===
 function f(p: A) => p;
 >f : (p: A) => any
->  : ^ ^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^
 >p : A
 >  : ^
 >p : any
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
index 72675341e2934..938154e596aeb 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
@@ -7,7 +7,7 @@ class Foo {
 
     public banana (x: break) { }
 >banana : (x: break) => void
->       : ^ ^^^^^^^^^^^^^^^^
+>       : ^ ^^     ^^^^^^^^^
 >x : break
 >  : ^^^^^
 }
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.types b/tests/baselines/reference/parserGenericsInTypeContexts1.types
index 6845b6326233c..35f7edf331487 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.types
@@ -37,14 +37,14 @@ var v6: K<T>[];
 
 function f1(a: E<T>) {
 >f1 : (a: E<T>) => void
->   : ^ ^^^^^^^^^^^^^^^
+>   : ^ ^^    ^^^^^^^^^
 >a : E<T>
 >  : ^^^^
 }
 
 function f2(): F<T> {
 >f2 : () => F<T>
->   : ^^^^^^^^^^
+>   : ^^^^^^    
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.types b/tests/baselines/reference/parserGenericsInTypeContexts2.types
index 928bcee3118b6..98fe0538ca6f5 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.types
@@ -37,14 +37,14 @@ var v6: K<X<T>, Y<Z<T>>>[];
 
 function f1(a: E<X<T>, Y<Z<T>>>) {
 >f1 : (a: E<X<T>, Y<Z<T>>>) => void
->   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>   : ^ ^^                ^^^^^^^^^
 >a : E<X<T>, Y<Z<T>>>
 >  : ^^^^^^^^^^^^^^^^
 }
 
 function f2(): F<X<T>, Y<Z<T>>> {
 >f2 : () => F<X<T>, Y<Z<T>>>
->   : ^^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^                
 }
 
 
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
index e1c3c66d02847..1745d213e848e 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
@@ -7,7 +7,7 @@ class C {
 
     where(filter: Iterator<T, boolean>): Query<T> {
 >where : (filter: Iterator<T, boolean>) => Query<T>
->      : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^      ^^                    ^^^^^        
 >filter : Iterator<T, boolean>
 >       : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserObjectType5.types b/tests/baselines/reference/parserObjectType5.types
index 620abab9f30ff..fe93d5cf1efd4 100644
--- a/tests/baselines/reference/parserObjectType5.types
+++ b/tests/baselines/reference/parserObjectType5.types
@@ -3,7 +3,7 @@
 === parserObjectType5.ts ===
 var v: {
 >v : { <T>(): any; A: B; }
->  : ^^^ ^^^^^^^^^^^^^^^^^
+>  : ^^^ ^^^^^^^^^^^^^ ^^^
 
    A: B
 >A : B
diff --git a/tests/baselines/reference/parserObjectType6.types b/tests/baselines/reference/parserObjectType6.types
index 990045de90b02..9d487d9bbee74 100644
--- a/tests/baselines/reference/parserObjectType6.types
+++ b/tests/baselines/reference/parserObjectType6.types
@@ -3,7 +3,7 @@
 === parserObjectType6.ts ===
 var v: {
 >v : { a: B; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 
    a: B
 >a : B
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index d81700003e0da..3ba5196d8a27d 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -886,7 +886,7 @@ module TypeScript {
 
     function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number,
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >tokenId : TokenID
 >        : ^^^^^^^
 >reservation : number
@@ -1015,7 +1015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Any, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "any", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Any : TokenID.Any
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1065,7 +1065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bool, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "boolean", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Bool : TokenID.Bool
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1115,7 +1115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Break, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "break", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Break : TokenID.Break
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1165,7 +1165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Case, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "case", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Case : TokenID.Case
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1215,7 +1215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Catch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "catch", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Catch : TokenID.Catch
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1265,7 +1265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Class, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "class", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Class : TokenID.Class
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1315,7 +1315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Const, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "const", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Const : TokenID.Const
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1365,7 +1365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Continue, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "continue", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Continue : TokenID.Continue
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1415,7 +1415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Debugger, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.Debugger, "debugger", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Debugger : TokenID.Debugger
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1465,7 +1465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Default, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "default", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Default : TokenID.Default
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1515,7 +1515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Delete, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Delete, "delete", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Delete : TokenID.Delete
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1565,7 +1565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Do, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "do", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Do : TokenID.Do
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1615,7 +1615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Else, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "else", ErrorRecoverySet.Else) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Else : TokenID.Else
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1665,7 +1665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Enum, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "enum", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Enum : TokenID.Enum
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1715,7 +1715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Export, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "export", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Export : TokenID.Export
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1765,7 +1765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Extends, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "extends", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Extends : TokenID.Extends
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1815,7 +1815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Declare, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "declare", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Declare : TokenID.Declare
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1865,7 +1865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.False, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "false", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.False : TokenID.False
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1915,7 +1915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Finally, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "finally", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Finally : TokenID.Finally
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1965,7 +1965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.For, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "for", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.For : TokenID.For
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2015,7 +2015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Function, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "function", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Function : TokenID.Function
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2065,7 +2065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Constructor, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "constructor", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Constructor : TokenID.Constructor
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2115,7 +2115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Get, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "get", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Get : TokenID.Get
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2165,7 +2165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Set, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "set", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Set : TokenID.Set
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2215,7 +2215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.If, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "if", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.If : TokenID.If
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2265,7 +2265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Implements, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "implements", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Implements : TokenID.Implements
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2315,7 +2315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Import, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "import", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Import : TokenID.Import
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2365,7 +2365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.In, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.In, OperatorPrecedence.None, NodeType.None, "in", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.In : TokenID.In
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2415,7 +2415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.InstanceOf, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.InstOf, OperatorPrecedence.None, NodeType.None, "instanceof", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.InstanceOf : TokenID.InstanceOf
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2465,7 +2465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Interface, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "interface", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Interface : TokenID.Interface
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2515,7 +2515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Let, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "let", ErrorRecoverySet.None) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Let : TokenID.Let
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2565,7 +2565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Module, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "module", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Module : TokenID.Module
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2615,7 +2615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.New, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "new", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.New : TokenID.New
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2665,7 +2665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Number, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "number", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Number : TokenID.Number
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2715,7 +2715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Null, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "null", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Null : TokenID.Null
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2765,7 +2765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Package, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "package", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Package : TokenID.Package
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2815,7 +2815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Private, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "private", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Private : TokenID.Private
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2865,7 +2865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Protected, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "protected", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Protected : TokenID.Protected
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2915,7 +2915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Public, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "public", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Public : TokenID.Public
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2965,7 +2965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Return, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "return", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Return : TokenID.Return
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3015,7 +3015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Static, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "static", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Static : TokenID.Static
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3065,7 +3065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.String, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "string", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.String : TokenID.String
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3115,7 +3115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Super, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "super", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Super : TokenID.Super
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3165,7 +3165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Switch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "switch", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Switch : TokenID.Switch
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3215,7 +3215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.This, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "this", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.This : TokenID.This
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3265,7 +3265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Throw, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "throw", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Throw : TokenID.Throw
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3315,7 +3315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.True, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "true", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.True : TokenID.True
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3365,7 +3365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Try, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "try", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Try : TokenID.Try
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3415,7 +3415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.TypeOf, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Typeof, "typeof", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.TypeOf : TokenID.TypeOf
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3465,7 +3465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Var, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "var", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Var : TokenID.Var
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3515,7 +3515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Void, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Void, "void", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Void : TokenID.Void
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3565,7 +3565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.With, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.With, "with", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.With : TokenID.With
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3615,7 +3615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.While, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "while", ErrorRecoverySet.While) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.While : TokenID.While
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3665,7 +3665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Yield, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "yield", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Yield : TokenID.Yield
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3715,7 +3715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Identifier, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "identifier", ErrorRecoverySet.ID) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Identifier : TokenID.Identifier
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3765,7 +3765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.NumberLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "numberLiteral", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.NumberLiteral : TokenID.NumberLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3815,7 +3815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.RegularExpressionLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "regex", ErrorRecoverySet.RegExp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.RegularExpressionLiteral : TokenID.RegularExpressionLiteral
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3865,7 +3865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.StringLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "qstring", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.StringLiteral : TokenID.StringLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3916,7 +3916,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Semicolon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ";", ErrorRecoverySet.SColon) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Semicolon : TokenID.Semicolon
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3966,7 +3966,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ")", ErrorRecoverySet.RParen) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseParen : TokenID.CloseParen
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4016,7 +4016,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "]", ErrorRecoverySet.RBrack) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseBracket : TokenID.CloseBracket
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4066,7 +4066,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "{", ErrorRecoverySet.LCurly) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenBrace : TokenID.OpenBrace
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4116,7 +4116,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "}", ErrorRecoverySet.RCurly) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseBrace : TokenID.CloseBrace
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4166,7 +4166,7 @@ module TypeScript {
 >setTokenInfo(TokenID.DotDotDot, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "...", ErrorRecoverySet.None) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.DotDotDot : TokenID.DotDotDot
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4217,7 +4217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Comma, Reservation.None, OperatorPrecedence.Comma, NodeType.Comma, OperatorPrecedence.None, NodeType.None, ",", ErrorRecoverySet.Comma) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Comma : TokenID.Comma
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4267,7 +4267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Equals, Reservation.None, OperatorPrecedence.Assignment, NodeType.Asg, OperatorPrecedence.None, NodeType.None, "=", ErrorRecoverySet.Asg) : void
 >                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Equals : TokenID.Equals
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4317,7 +4317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAdd, OperatorPrecedence.None, NodeType.None, "+=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PlusEquals : TokenID.PlusEquals
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4367,7 +4367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgSub, OperatorPrecedence.None, NodeType.None, "-=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.MinusEquals : TokenID.MinusEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4417,7 +4417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AsteriskEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMul, OperatorPrecedence.None, NodeType.None, "*=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AsteriskEquals : TokenID.AsteriskEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4467,7 +4467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.SlashEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgDiv, OperatorPrecedence.None, NodeType.None, "/=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.SlashEquals : TokenID.SlashEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4517,7 +4517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PercentEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMod, OperatorPrecedence.None, NodeType.None, "%=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PercentEquals : TokenID.PercentEquals
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4567,7 +4567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAnd, OperatorPrecedence.None, NodeType.None, "&=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AmpersandEquals : TokenID.AmpersandEquals
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4617,7 +4617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CaretEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgXor, OperatorPrecedence.None, NodeType.None, "^=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CaretEquals : TokenID.CaretEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4667,7 +4667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgOr, OperatorPrecedence.None, NodeType.None, "|=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.BarEquals : TokenID.BarEquals
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4717,7 +4717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgLsh, OperatorPrecedence.None, NodeType.None, "<<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanLessThanEquals : TokenID.LessThanLessThanEquals
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4767,7 +4767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRsh, OperatorPrecedence.None, NodeType.None, ">>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanEquals
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4817,7 +4817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRs2, OperatorPrecedence.None, NodeType.None, ">>>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanGreaterThanEquals
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4867,7 +4867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Question, Reservation.None, OperatorPrecedence.Conditional, NodeType.ConditionalExpression, OperatorPrecedence.None, NodeType.None, "?", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Question : TokenID.Question
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4917,7 +4917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Colon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ":", ErrorRecoverySet.Colon) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Colon : TokenID.Colon
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4967,7 +4967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarBar, Reservation.None, OperatorPrecedence.LogicalOr, NodeType.LogOr, OperatorPrecedence.None, NodeType.None, "||", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.BarBar : TokenID.BarBar
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5017,7 +5017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandAmpersand, Reservation.None, OperatorPrecedence.LogicalAnd, NodeType.LogAnd, OperatorPrecedence.None, NodeType.None, "&&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AmpersandAmpersand : TokenID.AmpersandAmpersand
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5067,7 +5067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bar, Reservation.None, OperatorPrecedence.BitwiseOr, NodeType.Or, OperatorPrecedence.None, NodeType.None, "|", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Bar : TokenID.Bar
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5117,7 +5117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Caret, Reservation.None, OperatorPrecedence.BitwiseExclusiveOr, NodeType.Xor, OperatorPrecedence.None, NodeType.None, "^", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Caret : TokenID.Caret
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5167,7 +5167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.And, Reservation.None, OperatorPrecedence.BitwiseAnd, NodeType.And, OperatorPrecedence.None, NodeType.None, "&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.And : TokenID.And
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5217,7 +5217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eq, OperatorPrecedence.None, NodeType.None, "==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsEquals : TokenID.EqualsEquals
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5267,7 +5267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Ne, OperatorPrecedence.None, NodeType.None, "!=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.ExclamationEquals : TokenID.ExclamationEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5317,7 +5317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eqv, OperatorPrecedence.None, NodeType.None, "===", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsEqualsEquals : TokenID.EqualsEqualsEquals
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5367,7 +5367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.NEqv, OperatorPrecedence.None, NodeType.None, "!==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.ExclamationEqualsEquals : TokenID.ExclamationEqualsEquals
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5417,7 +5417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Lt, OperatorPrecedence.None, NodeType.None, "<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThan : TokenID.LessThan
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5467,7 +5467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Le, OperatorPrecedence.None, NodeType.None, "<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanEquals : TokenID.LessThanEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5517,7 +5517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Gt, OperatorPrecedence.None, NodeType.None, ">", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThan : TokenID.GreaterThan
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5567,7 +5567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Ge, OperatorPrecedence.None, NodeType.None, ">=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanEquals : TokenID.GreaterThanEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5617,7 +5617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Lsh, OperatorPrecedence.None, NodeType.None, "<<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanLessThan : TokenID.LessThanLessThan
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5667,7 +5667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rsh, OperatorPrecedence.None, NodeType.None, ">>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThan : TokenID.GreaterThanGreaterThan
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5717,7 +5717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rs2, OperatorPrecedence.None, NodeType.None, ">>>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThan : TokenID.GreaterThanGreaterThanGreaterThan
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5767,7 +5767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Plus, Reservation.None, OperatorPrecedence.Additive, NodeType.Add, OperatorPrecedence.Unary, NodeType.Pos, "+", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Plus : TokenID.Plus
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5817,7 +5817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Minus, Reservation.None, OperatorPrecedence.Additive, NodeType.Sub, OperatorPrecedence.Unary, NodeType.Neg, "-", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Minus : TokenID.Minus
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5867,7 +5867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Asterisk, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mul, OperatorPrecedence.None, NodeType.None, "*", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Asterisk : TokenID.Asterisk
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5917,7 +5917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Slash, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Div, OperatorPrecedence.None, NodeType.None, "/", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Slash : TokenID.Slash
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5967,7 +5967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Percent, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mod, OperatorPrecedence.None, NodeType.None, "%", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Percent : TokenID.Percent
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6017,7 +6017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Tilde, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Not, "~", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Tilde : TokenID.Tilde
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6067,7 +6067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Exclamation, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.LogNot, "!", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Exclamation : TokenID.Exclamation
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6117,7 +6117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusPlus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.IncPre, "++", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PlusPlus : TokenID.PlusPlus
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6167,7 +6167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusMinus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.DecPre, "--", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.MinusMinus : TokenID.MinusMinus
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6217,7 +6217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "(", ErrorRecoverySet.LParen) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenParen : TokenID.OpenParen
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6267,7 +6267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "[", ErrorRecoverySet.LBrack) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenBracket : TokenID.OpenBracket
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6317,7 +6317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Dot, Reservation.None, OperatorPrecedence.Unary, NodeType.None, OperatorPrecedence.None, NodeType.None, ".", ErrorRecoverySet.Dot) : void
 >                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Dot : TokenID.Dot
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6367,7 +6367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EndOfFile, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "<EOF>", ErrorRecoverySet.EOF) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EndOfFile : TokenID.EndOfFile
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6417,7 +6417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsGreaterThan, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "=>", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsGreaterThan : TokenID.EqualsGreaterThan
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index 2eee22d1ed353..d941bb4c4efe1 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -136,7 +136,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -336,7 +336,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -777,7 +777,7 @@ module TypeScript {
 
         public print(context: PrintContext) {
 >print : (context: PrintContext) => void
->      : ^       ^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^       ^^            ^^^^^^^^^
 >context : PrintContext
 >        : ^^^^^^^^^^^^
 
@@ -1055,7 +1055,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1095,7 +1095,7 @@ module TypeScript {
 
         public netFreeUses(container: Symbol, freeUses: StringHashTable) {
 >netFreeUses : (container: Symbol, freeUses: StringHashTable) => void
->            : ^         ^^      ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>            : ^         ^^      ^^        ^^               ^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 >freeUses : StringHashTable
@@ -1411,7 +1411,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1666,7 +1666,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -1725,7 +1725,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -1797,7 +1797,7 @@ module TypeScript {
 >this.members[i].typeCheck(typeFlow) : any
 >                                    : ^^^
 >this.members[i].typeCheck : (typeFlow: TypeFlow) => any
->                          : ^        ^^^^^^^^^^^^^^^^^^
+>                          : ^        ^^        ^^^^^^^^
 >this.members[i] : AST
 >                : ^^^
 >this.members : AST[]
@@ -1809,7 +1809,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
                 }
@@ -2018,7 +2018,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2037,7 +2037,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2062,7 +2062,7 @@ module TypeScript {
 
         public static fromToken(token: Token): Identifier {
 >fromToken : (token: Token) => Identifier
->          : ^     ^^^^^^^^^^^^          
+>          : ^     ^^     ^^^^^          
 >token : Token
 >      : ^^^^^
 
@@ -2119,7 +2119,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2174,7 +2174,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2201,7 +2201,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2390,7 +2390,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2398,11 +2398,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Expression
 >      : ^^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2437,7 +2437,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2992,7 +2992,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -3835,7 +3835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -3884,7 +3884,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -4035,7 +4035,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -4777,7 +4777,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5447,7 +5447,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5466,7 +5466,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5657,7 +5657,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5703,7 +5703,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5946,7 +5946,7 @@ module TypeScript {
         
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5973,7 +5973,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6082,7 +6082,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6161,7 +6161,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6286,7 +6286,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6571,7 +6571,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6864,7 +6864,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6988,7 +6988,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7111,7 +7111,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7728,7 +7728,7 @@ module TypeScript {
 
         public buildControlFlow(): ControlFlowContext {
 >buildControlFlow : () => ControlFlowContext
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^^^^^^                  
 
             var entry = new BasicBlock();
 >entry : any
@@ -7760,9 +7760,9 @@ module TypeScript {
 
             var controlFlowPrefix = (ast: AST, parent: AST, walker: IAstWalker) => {
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >(ast: AST, parent: AST, walker: IAstWalker) => {                ast.addToControlFlow(walker.state);                return ast;            } : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7774,11 +7774,11 @@ module TypeScript {
 >ast.addToControlFlow(walker.state) : void
 >                                   : ^^^^
 >ast.addToControlFlow : (context: ControlFlowContext) => void
->                     : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                     : ^       ^^                  ^^^^^    
 >ast : AST
 >    : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >walker.state : any
 >             : ^^^
 >walker : IAstWalker
@@ -7805,7 +7805,7 @@ module TypeScript {
 >getWalker : any
 >          : ^^^
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >context : any
 >        : ^^^
 
@@ -7846,7 +7846,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -7865,7 +7865,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -8540,7 +8540,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -8873,7 +8873,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9231,7 +9231,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9250,7 +9250,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9506,7 +9506,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9525,7 +9525,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9592,7 +9592,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9611,7 +9611,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9682,7 +9682,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9735,7 +9735,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9815,7 +9815,7 @@ module TypeScript {
 >this.labels.members[i].emit(emitter, tokenId, startLine) : void
 >                                                         : ^^^^
 >this.labels.members[i].emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->                            : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>                            : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >this.labels.members[i] : AST
 >                       : ^^^
 >this.labels.members : AST[]
@@ -9831,7 +9831,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9844,7 +9844,7 @@ module TypeScript {
 >this.stmt.emit(emitter, tokenId, true) : void
 >                                       : ^^^^
 >this.stmt.emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->               : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>               : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9852,7 +9852,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9889,7 +9889,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9921,7 +9921,7 @@ module TypeScript {
 >this.stmt.typeCheck(typeFlow) : any
 >                              : ^^^
 >this.stmt.typeCheck : (typeFlow: TypeFlow) => any
->                    : ^        ^^^^^^^^^^^^^^^^^^
+>                    : ^        ^^        ^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9929,7 +9929,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9940,7 +9940,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10017,7 +10017,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10245,7 +10245,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10381,7 +10381,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -10524,7 +10524,7 @@ module TypeScript {
 
         public setResolvedTarget(parser: Parser, stmt: Statement): boolean {
 >setResolvedTarget : (parser: Parser, stmt: Statement) => boolean
->                  : ^      ^^^^^^^^^^    ^^         ^^^^^       
+>                  : ^      ^^      ^^    ^^         ^^^^^       
 >parser : Parser
 >       : ^^^^^^
 >stmt : Statement
@@ -10655,7 +10655,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10663,11 +10663,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10706,7 +10706,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10886,7 +10886,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11043,7 +11043,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11062,7 +11062,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11365,7 +11365,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11578,7 +11578,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11597,7 +11597,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11872,7 +11872,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12101,7 +12101,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -12120,7 +12120,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12128,7 +12128,7 @@ module TypeScript {
 >this.cond.addToControlFlow(context) : void
 >                                    : ^^^^
 >this.cond.addToControlFlow : (context: ControlFlowContext) => void
->                           : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                           : ^       ^^                  ^^^^^    
 >this.cond : AST
 >          : ^^^
 >this : this
@@ -12136,7 +12136,7 @@ module TypeScript {
 >cond : AST
 >     : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12530,7 +12530,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12676,7 +12676,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12684,11 +12684,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12705,7 +12705,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13357,7 +13357,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -13582,7 +13582,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13652,7 +13652,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -13942,7 +13942,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14257,7 +14257,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14276,7 +14276,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -14779,7 +14779,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14919,7 +14919,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14984,7 +14984,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15299,7 +15299,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15451,7 +15451,7 @@ module TypeScript {
         // if there are break statements that match this switch, then just link cond block with block after switch
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -15730,7 +15730,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15882,7 +15882,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15951,7 +15951,7 @@ module TypeScript {
         // for now, assume all cases are reachable, regardless of whether some cases fall through
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16170,7 +16170,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16189,7 +16189,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16397,7 +16397,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16480,7 +16480,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16557,7 +16557,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16803,7 +16803,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16914,7 +16914,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17163,7 +17163,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17266,7 +17266,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17365,7 +17365,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17400,7 +17400,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17531,7 +17531,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17710,7 +17710,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17835,7 +17835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18288,7 +18288,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -18387,7 +18387,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -18452,7 +18452,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18687,7 +18687,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index 28627d5cc3cf2..6763d907264ef 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -13,7 +13,7 @@ module TypeScript {
     export interface IAstWalker {
         walk(ast: AST, parent: AST): AST;
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -136,7 +136,7 @@ module TypeScript {
 
         public walk(ast: AST, parent: AST): AST {
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -355,7 +355,7 @@ module TypeScript {
 
         public walk(ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): AST {
 >walk : (ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => AST
->     : ^   ^^^^^^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^^^^
+>     : ^   ^^   ^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >pre : IAstWalkCallback
@@ -371,7 +371,7 @@ module TypeScript {
 >this.getWalker(pre, post, options, state).walk(ast, null) : AST
 >                                                          : ^^^
 >this.getWalker(pre, post, options, state).walk : (ast: AST, parent: AST) => AST
->                                               : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                               : ^   ^^   ^^      ^^   ^^^^^   
 >this.getWalker(pre, post, options, state) : IAstWalker
 >                                          : ^^^^^^^^^^
 >this.getWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
@@ -389,7 +389,7 @@ module TypeScript {
 >state : any
 >      : ^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
         }
@@ -481,7 +481,7 @@ module TypeScript {
 
             this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.None] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -497,15 +497,15 @@ module TypeScript {
 >None : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Empty] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -521,15 +521,15 @@ module TypeScript {
 >Empty : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EmptyExpr] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -545,15 +545,15 @@ module TypeScript {
 >EmptyExpr : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.True] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -569,15 +569,15 @@ module TypeScript {
 >True : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.False] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -593,15 +593,15 @@ module TypeScript {
 >False : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.This] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -617,15 +617,15 @@ module TypeScript {
 >This : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Super] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -641,15 +641,15 @@ module TypeScript {
 >Super : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.QString] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -665,15 +665,15 @@ module TypeScript {
 >QString : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Regex] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -689,15 +689,15 @@ module TypeScript {
 >Regex : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Null] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -713,15 +713,15 @@ module TypeScript {
 >Null : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArrayLit] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -737,15 +737,15 @@ module TypeScript {
 >ArrayLit : any
 >         : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                       : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                       : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ObjectLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -761,15 +761,15 @@ module TypeScript {
 >ObjectLit : any
 >          : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Void] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -785,15 +785,15 @@ module TypeScript {
 >Void : any
 >     : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comma] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -809,15 +809,15 @@ module TypeScript {
 >Comma : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Pos] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -833,15 +833,15 @@ module TypeScript {
 >Pos : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Neg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -857,15 +857,15 @@ module TypeScript {
 >Neg : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Delete] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -881,15 +881,15 @@ module TypeScript {
 >Delete : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Await] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -905,15 +905,15 @@ module TypeScript {
 >Await : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.In] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -929,15 +929,15 @@ module TypeScript {
 >In : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Dot] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -953,15 +953,15 @@ module TypeScript {
 >Dot : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.From] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -977,15 +977,15 @@ module TypeScript {
 >From : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Is] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1001,15 +1001,15 @@ module TypeScript {
 >Is : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InstOf] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1025,15 +1025,15 @@ module TypeScript {
 >InstOf : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Typeof] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1049,15 +1049,15 @@ module TypeScript {
 >Typeof : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NumberLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1073,15 +1073,15 @@ module TypeScript {
 >NumberLit : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Name] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1097,15 +1097,15 @@ module TypeScript {
 >Name : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren;
 >this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeRef] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1121,15 +1121,15 @@ module TypeScript {
 >TypeRef : any
 >        : ^^^
 >ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Index] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1145,15 +1145,15 @@ module TypeScript {
 >Index : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Call] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1169,15 +1169,15 @@ module TypeScript {
 >Call : any
 >     : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.New] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1193,15 +1193,15 @@ module TypeScript {
 >New : any
 >    : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Asg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1217,15 +1217,15 @@ module TypeScript {
 >Asg : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAdd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1241,15 +1241,15 @@ module TypeScript {
 >AsgAdd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgSub] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1265,15 +1265,15 @@ module TypeScript {
 >AsgSub : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgDiv] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1289,15 +1289,15 @@ module TypeScript {
 >AsgDiv : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMul] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1313,15 +1313,15 @@ module TypeScript {
 >AsgMul : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMod] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1337,15 +1337,15 @@ module TypeScript {
 >AsgMod : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1361,15 +1361,15 @@ module TypeScript {
 >AsgAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgXor] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1385,15 +1385,15 @@ module TypeScript {
 >AsgXor : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1409,15 +1409,15 @@ module TypeScript {
 >AsgOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgLsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1433,15 +1433,15 @@ module TypeScript {
 >AsgLsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1457,15 +1457,15 @@ module TypeScript {
 >AsgRsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRs2] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1481,15 +1481,15 @@ module TypeScript {
 >AsgRs2 : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren;
 >this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                                     : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ConditionalExpression] : IAstWalkChildren
 >                                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1505,15 +1505,15 @@ module TypeScript {
 >ConditionalExpression : any
 >                      : ^^^
 >ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1529,15 +1529,15 @@ module TypeScript {
 >LogOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1553,15 +1553,15 @@ module TypeScript {
 >LogAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Or] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1577,15 +1577,15 @@ module TypeScript {
 >Or : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Xor] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1601,15 +1601,15 @@ module TypeScript {
 >Xor : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.And] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1625,15 +1625,15 @@ module TypeScript {
 >And : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eq] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1649,15 +1649,15 @@ module TypeScript {
 >Eq : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ne] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1673,15 +1673,15 @@ module TypeScript {
 >Ne : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eqv] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1697,15 +1697,15 @@ module TypeScript {
 >Eqv : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NEqv] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1721,15 +1721,15 @@ module TypeScript {
 >NEqv : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1745,15 +1745,15 @@ module TypeScript {
 >Lt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Le] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1769,15 +1769,15 @@ module TypeScript {
 >Le : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Gt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1793,15 +1793,15 @@ module TypeScript {
 >Gt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ge] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1817,15 +1817,15 @@ module TypeScript {
 >Ge : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Add] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1841,15 +1841,15 @@ module TypeScript {
 >Add : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Sub] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1865,15 +1865,15 @@ module TypeScript {
 >Sub : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mul] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1889,15 +1889,15 @@ module TypeScript {
 >Mul : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Div] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1913,15 +1913,15 @@ module TypeScript {
 >Div : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mod] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1937,15 +1937,15 @@ module TypeScript {
 >Mod : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1961,15 +1961,15 @@ module TypeScript {
 >Lsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1985,15 +1985,15 @@ module TypeScript {
 >Rsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rs2] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2009,15 +2009,15 @@ module TypeScript {
 >Rs2 : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Not] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2033,15 +2033,15 @@ module TypeScript {
 >Not : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogNot] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2057,15 +2057,15 @@ module TypeScript {
 >LogNot : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2081,15 +2081,15 @@ module TypeScript {
 >IncPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2105,15 +2105,15 @@ module TypeScript {
 >DecPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2129,15 +2129,15 @@ module TypeScript {
 >IncPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2153,15 +2153,15 @@ module TypeScript {
 >DecPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeAssertion] : IAstWalkChildren
 >                                             : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2177,15 +2177,15 @@ module TypeScript {
 >TypeAssertion : any
 >              : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren;
 >this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.FuncDecl] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2201,15 +2201,15 @@ module TypeScript {
 >FuncDecl : any
 >         : ^^^
 >ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Member] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2225,15 +2225,15 @@ module TypeScript {
 >Member : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.VarDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2249,15 +2249,15 @@ module TypeScript {
 >VarDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArgDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2273,15 +2273,15 @@ module TypeScript {
 >ArgDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren;
 >this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Return] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2297,15 +2297,15 @@ module TypeScript {
 >Return : any
 >       : ^^^
 >ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Break] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2321,15 +2321,15 @@ module TypeScript {
 >Break : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Continue] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2345,15 +2345,15 @@ module TypeScript {
 >Continue : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Throw] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2369,15 +2369,15 @@ module TypeScript {
 >Throw : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren;
 >this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                                                              : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                              : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.For] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2393,15 +2393,15 @@ module TypeScript {
 >For : any
 >    : ^^^
 >ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren;
 >this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ForIn] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2417,15 +2417,15 @@ module TypeScript {
 >ForIn : any
 >      : ^^^
 >ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren;
 >this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                                                            : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                            : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.If] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2441,15 +2441,15 @@ module TypeScript {
 >If : any
 >   : ^^^
 >ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren;
 >this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.While] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2465,15 +2465,15 @@ module TypeScript {
 >While : any
 >      : ^^^
 >ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren;
 >this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DoWhile] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2489,15 +2489,15 @@ module TypeScript {
 >DoWhile : any
 >        : ^^^
 >ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren;
 >this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Block] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2513,15 +2513,15 @@ module TypeScript {
 >Block : any
 >      : ^^^
 >ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren;
 >this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Case] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2537,15 +2537,15 @@ module TypeScript {
 >Case : any
 >     : ^^^
 >ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren;
 >this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Switch] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2561,15 +2561,15 @@ module TypeScript {
 >Switch : any
 >       : ^^^
 >ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren;
 >this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                                                     : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                     : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Try] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2585,15 +2585,15 @@ module TypeScript {
 >Try : any
 >    : ^^^
 >ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren;
 >this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryCatch] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2609,15 +2609,15 @@ module TypeScript {
 >TryCatch : any
 >         : ^^^
 >ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren;
 >this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryFinally] : IAstWalkChildren
 >                                          : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2633,15 +2633,15 @@ module TypeScript {
 >TryFinally : any
 >           : ^^^
 >ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren;
 >this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                                                             : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                             : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Finally] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2657,15 +2657,15 @@ module TypeScript {
 >Finally : any
 >        : ^^^
 >ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren;
 >this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Catch] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2681,15 +2681,15 @@ module TypeScript {
 >Catch : any
 >      : ^^^
 >ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren;
 >this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                       : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                       : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.List] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2705,15 +2705,15 @@ module TypeScript {
 >List : any
 >     : ^^^
 >ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren;
 >this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                                                           : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                           : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Script] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2729,15 +2729,15 @@ module TypeScript {
 >Script : any
 >       : ^^^
 >ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren;
 >this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                        : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                        : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ClassDeclaration] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2753,15 +2753,15 @@ module TypeScript {
 >ClassDeclaration : any
 >                 : ^^^
 >ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren;
 >this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InterfaceDeclaration] : IAstWalkChildren
 >                                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2777,15 +2777,15 @@ module TypeScript {
 >InterfaceDeclaration : any
 >                     : ^^^
 >ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren;
 >this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ModuleDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2801,15 +2801,15 @@ module TypeScript {
 >ModuleDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren;
 >this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ImportDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2825,15 +2825,15 @@ module TypeScript {
 >ImportDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren;
 >this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.With] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2849,15 +2849,15 @@ module TypeScript {
 >With : any
 >     : ^^^
 >ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren;
 >this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Label] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2873,15 +2873,15 @@ module TypeScript {
 >Label : any
 >      : ^^^
 >ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren;
 >this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                                                                               : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                               : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LabeledStatement] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2897,15 +2897,15 @@ module TypeScript {
 >LabeledStatement : any
 >                 : ^^^
 >ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EBStart] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2921,15 +2921,15 @@ module TypeScript {
 >EBStart : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.GotoEB] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2945,15 +2945,15 @@ module TypeScript {
 >GotoEB : any
 >       : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EndCode] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2969,15 +2969,15 @@ module TypeScript {
 >EndCode : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Error] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2993,15 +2993,15 @@ module TypeScript {
 >Error : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comment] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3017,15 +3017,15 @@ module TypeScript {
 >Comment : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Debugger] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3041,11 +3041,11 @@ module TypeScript {
 >Debugger : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             // Verify the code is up to date with the enum
             for (var e in (<any>NodeType)._map) {
@@ -3129,7 +3129,7 @@ module TypeScript {
 
         export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3142,7 +3142,7 @@ module TypeScript {
 
         export function walkListChildren(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3224,11 +3224,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3289,11 +3289,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3313,7 +3313,7 @@ module TypeScript {
 
         export function walkUnaryExpressionChildren(preAst: UnaryExpression, parent: AST, walker: IAstWalker): void {
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : UnaryExpression
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -3341,11 +3341,11 @@ module TypeScript {
 >walker.walk(preAst.castTerm, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.castTerm : any
 >                : ^^^
 >preAst : UnaryExpression
@@ -3375,11 +3375,11 @@ module TypeScript {
 >walker.walk(preAst.operand, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand : any
 >               : ^^^
 >preAst : UnaryExpression
@@ -3393,7 +3393,7 @@ module TypeScript {
 
         export function walkBinaryExpressionChildren(preAst: BinaryExpression, parent: AST, walker: IAstWalker): void {
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : BinaryExpression
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3433,11 +3433,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3483,11 +3483,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3518,11 +3518,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3568,11 +3568,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3587,7 +3587,7 @@ module TypeScript {
 
         export function walkTypeReferenceChildren(preAst: TypeReference, parent: AST, walker: IAstWalker): void {
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeReference
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -3615,11 +3615,11 @@ module TypeScript {
 >walker.walk(preAst.term, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.term : any
 >            : ^^^
 >preAst : TypeReference
@@ -3633,7 +3633,7 @@ module TypeScript {
 
         export function walkCallExpressionChildren(preAst: CallExpression, parent: AST, walker: IAstWalker): void {
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : CallExpression
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -3667,11 +3667,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3717,11 +3717,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.arguments : any
 >                 : ^^^
 >preAst : CallExpression
@@ -3771,11 +3771,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3789,7 +3789,7 @@ module TypeScript {
 
         export function walkTrinaryExpressionChildren(preAst: ConditionalExpression, parent: AST, walker: IAstWalker): void {
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ConditionalExpression
 >       : ^^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3817,11 +3817,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3865,11 +3865,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3913,11 +3913,11 @@ module TypeScript {
 >walker.walk(preAst.operand3, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand3 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3931,7 +3931,7 @@ module TypeScript {
 
         export function walkFuncDeclChildren(preAst: FuncDecl, parent: AST, walker: IAstWalker): void {
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : FuncDecl
 >       : ^^^^^^^^
 >parent : AST
@@ -3961,11 +3961,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.name : any
 >            : ^^^
 >preAst : FuncDecl
@@ -4033,11 +4033,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.arguments : any
 >                 : ^^^
 >preAst : FuncDecl
@@ -4081,11 +4081,11 @@ module TypeScript {
 >walker.walk(preAst.returnTypeAnnotation, preAst) : AST
 >                                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.returnTypeAnnotation : any
 >                            : ^^^
 >preAst : FuncDecl
@@ -4153,11 +4153,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.bod : any
 >           : ^^^
 >preAst : FuncDecl
@@ -4171,7 +4171,7 @@ module TypeScript {
 
         export function walkBoundDeclChildren(preAst: BoundDecl, parent: AST, walker: IAstWalker): void {
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : BoundDecl
 >       : ^^^^^^^^^
 >parent : AST
@@ -4201,11 +4201,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.id : any
 >          : ^^^
 >preAst : BoundDecl
@@ -4235,11 +4235,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.init : any
 >            : ^^^
 >preAst : BoundDecl
@@ -4285,11 +4285,11 @@ module TypeScript {
 >walker.walk(preAst.typeExpr, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.typeExpr : any
 >                : ^^^
 >preAst : BoundDecl
@@ -4303,7 +4303,7 @@ module TypeScript {
 
         export function walkReturnStatementChildren(preAst: ReturnStatement, parent: AST, walker: IAstWalker): void {
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ReturnStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -4331,11 +4331,11 @@ module TypeScript {
 >walker.walk(preAst.returnExpression, preAst) : AST
 >                                             : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.returnExpression : any
 >                        : ^^^
 >preAst : ReturnStatement
@@ -4349,7 +4349,7 @@ module TypeScript {
 
         export function walkForStatementChildren(preAst: ForStatement, parent: AST, walker: IAstWalker): void {
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ForStatement
 >       : ^^^^^^^^^^^^
 >parent : AST
@@ -4377,11 +4377,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.init : any
 >            : ^^^
 >preAst : ForStatement
@@ -4424,11 +4424,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : ForStatement
@@ -4471,11 +4471,11 @@ module TypeScript {
 >walker.walk(preAst.incr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.incr : any
 >            : ^^^
 >preAst : ForStatement
@@ -4518,11 +4518,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : ForStatement
@@ -4536,7 +4536,7 @@ module TypeScript {
 
         export function walkForInStatementChildren(preAst: ForInStatement, parent: AST, walker: IAstWalker): void {
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ForInStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4556,11 +4556,11 @@ module TypeScript {
 >walker.walk(preAst.lval, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.lval : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4594,11 +4594,11 @@ module TypeScript {
 >walker.walk(preAst.obj, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.obj : any
 >           : ^^^
 >preAst : ForInStatement
@@ -4642,11 +4642,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4660,7 +4660,7 @@ module TypeScript {
 
         export function walkIfStatementChildren(preAst: IfStatement, parent: AST, walker: IAstWalker): void {
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : IfStatement
 >       : ^^^^^^^^^^^
 >parent : AST
@@ -4680,11 +4680,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : IfStatement
@@ -4728,11 +4728,11 @@ module TypeScript {
 >walker.walk(preAst.thenBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.thenBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4776,11 +4776,11 @@ module TypeScript {
 >walker.walk(preAst.elseBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.elseBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4794,7 +4794,7 @@ module TypeScript {
 
         export function walkWhileStatementChildren(preAst: WhileStatement, parent: AST, walker: IAstWalker): void {
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : WhileStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4814,11 +4814,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4862,11 +4862,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4880,7 +4880,7 @@ module TypeScript {
 
         export function walkDoWhileStatementChildren(preAst: DoWhileStatement, parent: AST, walker: IAstWalker): void {
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : DoWhileStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -4900,11 +4900,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4948,11 +4948,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4966,7 +4966,7 @@ module TypeScript {
 
         export function walkBlockChildren(preAst: Block, parent: AST, walker: IAstWalker): void {
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Block
 >       : ^^^^^
 >parent : AST
@@ -4996,11 +4996,11 @@ module TypeScript {
 >walker.walk(preAst.statements, preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.statements : any
 >                  : ^^^
 >preAst : Block
@@ -5014,7 +5014,7 @@ module TypeScript {
 
         export function walkCaseStatementChildren(preAst: CaseStatement, parent: AST, walker: IAstWalker): void {
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : CaseStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -5042,11 +5042,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.expr : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5091,11 +5091,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5109,7 +5109,7 @@ module TypeScript {
 
         export function walkSwitchStatementChildren(preAst: SwitchStatement, parent: AST, walker: IAstWalker): void {
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : SwitchStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5137,11 +5137,11 @@ module TypeScript {
 >walker.walk(preAst.val, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.val : any
 >           : ^^^
 >preAst : SwitchStatement
@@ -5188,11 +5188,11 @@ module TypeScript {
 >walker.walk(preAst.caseList, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.caseList : any
 >                : ^^^
 >preAst : SwitchStatement
@@ -5206,7 +5206,7 @@ module TypeScript {
 
         export function walkTryChildren(preAst: Try, parent: AST, walker: IAstWalker): void {
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Try
 >       : ^^^
 >parent : AST
@@ -5234,11 +5234,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Try
@@ -5252,7 +5252,7 @@ module TypeScript {
 
         export function walkTryCatchChildren(preAst: TryCatch, parent: AST, walker: IAstWalker): void {
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TryCatch
 >       : ^^^^^^^^
 >parent : AST
@@ -5282,11 +5282,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryCatch
@@ -5333,11 +5333,11 @@ module TypeScript {
 >walker.walk(preAst.catchNode, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.catchNode : any
 >                 : ^^^
 >preAst : TryCatch
@@ -5351,7 +5351,7 @@ module TypeScript {
 
         export function walkTryFinallyChildren(preAst: TryFinally, parent: AST, walker: IAstWalker): void {
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TryFinally
 >       : ^^^^^^^^^^
 >parent : AST
@@ -5379,11 +5379,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryFinally
@@ -5428,11 +5428,11 @@ module TypeScript {
 >walker.walk(preAst.finallyNode, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.finallyNode : any
 >                   : ^^^
 >preAst : TryFinally
@@ -5446,7 +5446,7 @@ module TypeScript {
 
         export function walkFinallyChildren(preAst: Finally, parent: AST, walker: IAstWalker): void {
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Finally
 >       : ^^^^^^^
 >parent : AST
@@ -5474,11 +5474,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Finally
@@ -5492,7 +5492,7 @@ module TypeScript {
 
         export function walkCatchChildren(preAst: Catch, parent: AST, walker: IAstWalker): void {
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Catch
 >       : ^^^^^
 >parent : AST
@@ -5522,11 +5522,11 @@ module TypeScript {
 >walker.walk(preAst.param, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.param : any
 >             : ^^^
 >preAst : Catch
@@ -5571,11 +5571,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Catch
@@ -5589,7 +5589,7 @@ module TypeScript {
 
         export function walkRecordChildren(preAst: NamedDeclaration, parent: AST, walker: IAstWalker): void {
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : NamedDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5611,11 +5611,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.name : any
 >            : ^^^
 >preAst : NamedDeclaration
@@ -5659,11 +5659,11 @@ module TypeScript {
 >walker.walk(preAst.members, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members : any
 >               : ^^^
 >preAst : NamedDeclaration
@@ -5678,7 +5678,7 @@ module TypeScript {
 
         export function walkNamedTypeChildren(preAst: TypeDeclaration, parent: AST, walker: IAstWalker): void {
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5690,7 +5690,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5701,7 +5701,7 @@ module TypeScript {
 
         export function walkClassDeclChildren(preAst: ClassDeclaration, parent: AST, walker: IAstWalker): void {
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5713,7 +5713,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5755,11 +5755,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : ClassDeclaration
@@ -5804,11 +5804,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : ClassDeclaration
@@ -5822,7 +5822,7 @@ module TypeScript {
 
         export function walkScriptChildren(preAst: Script, parent: AST, walker: IAstWalker): void {
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Script
 >       : ^^^^^^
 >parent : AST
@@ -5852,11 +5852,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.bod : any
 >           : ^^^
 >preAst : Script
@@ -5870,7 +5870,7 @@ module TypeScript {
 
         export function walkTypeDeclChildren(preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker): void {
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5882,7 +5882,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5925,11 +5925,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : InterfaceDeclaration
@@ -5974,11 +5974,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : InterfaceDeclaration
@@ -5992,7 +5992,7 @@ module TypeScript {
 
         export function walkModuleDeclChildren(preAst: ModuleDeclaration, parent: AST, walker: IAstWalker): void {
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6004,7 +6004,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6015,7 +6015,7 @@ module TypeScript {
 
         export function walkImportDeclChildren(preAst: ImportDeclaration, parent: AST, walker: IAstWalker): void {
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ImportDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6045,11 +6045,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.id : any
 >          : ^^^
 >preAst : ImportDeclaration
@@ -6079,11 +6079,11 @@ module TypeScript {
 >walker.walk(preAst.alias, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.alias : any
 >             : ^^^
 >preAst : ImportDeclaration
@@ -6097,7 +6097,7 @@ module TypeScript {
 
         export function walkWithStatementChildren(preAst: WithStatement, parent: AST, walker: IAstWalker): void {
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : WithStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -6125,11 +6125,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.expr : any
 >            : ^^^
 >preAst : WithStatement
@@ -6172,11 +6172,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : WithStatement
@@ -6190,7 +6190,7 @@ module TypeScript {
 
         export function walkLabelChildren(preAst: Label, parent: AST, walker: IAstWalker): void {
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Label
 >       : ^^^^^
 >parent : AST
@@ -6203,7 +6203,7 @@ module TypeScript {
 
         export function walkLabeledStatementChildren(preAst: LabeledStatement, parent: AST, walker: IAstWalker): void {
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : LabeledStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6225,11 +6225,11 @@ module TypeScript {
 >walker.walk(preAst.labels, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.labels : any
 >              : ^^^
 >preAst : LabeledStatement
@@ -6263,11 +6263,11 @@ module TypeScript {
 >walker.walk(preAst.stmt, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.stmt : any
 >            : ^^^
 >preAst : LabeledStatement
diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types
index a67ca5abfadf0..90f4660a711ff 100644
--- a/tests/baselines/reference/parserRealSource13.types
+++ b/tests/baselines/reference/parserRealSource13.types
@@ -15,7 +15,7 @@ module TypeScript.AstWalkerWithDetailCallback {
     export interface AstWalkerDetailCallback {
         EmptyCallback? (pre, ast: AST): boolean;
 >EmptyCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -23,7 +23,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EmptyExprCallback? (pre, ast: AST): boolean;
 >EmptyExprCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -31,7 +31,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TrueCallback? (pre, ast: AST): boolean;
 >TrueCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -39,7 +39,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FalseCallback? (pre, ast: AST): boolean;
 >FalseCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -47,7 +47,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThisCallback? (pre, ast: AST): boolean;
 >ThisCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -55,7 +55,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SuperCallback? (pre, ast: AST): boolean;
 >SuperCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -63,7 +63,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QStringCallback? (pre, ast: AST): boolean;
 >QStringCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -71,7 +71,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RegexCallback? (pre, ast: AST): boolean;
 >RegexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -79,7 +79,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NullCallback? (pre, ast: AST): boolean;
 >NullCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -87,7 +87,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArrayLitCallback? (pre, ast: AST): boolean;
 >ArrayLitCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -95,7 +95,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ObjectLitCallback? (pre, ast: AST): boolean;
 >ObjectLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -103,7 +103,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VoidCallback? (pre, ast: AST): boolean;
 >VoidCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -111,7 +111,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommaCallback? (pre, ast: AST): boolean;
 >CommaCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -119,7 +119,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         PosCallback? (pre, ast: AST): boolean;
 >PosCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -127,7 +127,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NegCallback? (pre, ast: AST): boolean;
 >NegCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -135,7 +135,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DeleteCallback? (pre, ast: AST): boolean;
 >DeleteCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -143,7 +143,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AwaitCallback? (pre, ast: AST): boolean;
 >AwaitCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -151,7 +151,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InCallback? (pre, ast: AST): boolean;
 >InCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -159,7 +159,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DotCallback? (pre, ast: AST): boolean;
 >DotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -167,7 +167,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FromCallback? (pre, ast: AST): boolean;
 >FromCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -175,7 +175,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IsCallback? (pre, ast: AST): boolean;
 >IsCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -183,7 +183,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InstOfCallback? (pre, ast: AST): boolean;
 >InstOfCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -191,7 +191,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeofCallback? (pre, ast: AST): boolean;
 >TypeofCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -199,7 +199,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NumberLitCallback? (pre, ast: AST): boolean;
 >NumberLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -207,7 +207,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NameCallback? (pre, identifierAst: Identifier): boolean;
 >NameCallback : (pre: any, identifierAst: Identifier) => boolean
->             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^       
+>             : ^   ^^^^^^^             ^^          ^^^^^       
 >pre : any
 >    : ^^^
 >identifierAst : Identifier
@@ -215,7 +215,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeRefCallback? (pre, ast: AST): boolean;
 >TypeRefCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -223,7 +223,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IndexCallback? (pre, ast: AST): boolean;
 >IndexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -231,7 +231,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CallCallback? (pre, ast: AST): boolean;
 >CallCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -239,7 +239,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NewCallback? (pre, ast: AST): boolean;
 >NewCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -247,7 +247,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgCallback? (pre, ast: AST): boolean;
 >AsgCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -255,7 +255,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAddCallback? (pre, ast: AST): boolean;
 >AsgAddCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -263,7 +263,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgSubCallback? (pre, ast: AST): boolean;
 >AsgSubCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -271,7 +271,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgDivCallback? (pre, ast: AST): boolean;
 >AsgDivCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -279,7 +279,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgMulCallback? (pre, ast: AST): boolean;
 >AsgMulCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -287,7 +287,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgModCallback? (pre, ast: AST): boolean;
 >AsgModCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -295,7 +295,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAndCallback? (pre, ast: AST): boolean;
 >AsgAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -303,7 +303,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgXorCallback? (pre, ast: AST): boolean;
 >AsgXorCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -311,7 +311,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgOrCallback? (pre, ast: AST): boolean;
 >AsgOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -319,7 +319,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgLshCallback? (pre, ast: AST): boolean;
 >AsgLshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -327,7 +327,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRshCallback? (pre, ast: AST): boolean;
 >AsgRshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -335,7 +335,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRs2Callback? (pre, ast: AST): boolean;
 >AsgRs2Callback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -343,7 +343,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QMarkCallback? (pre, ast: AST): boolean;
 >QMarkCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -351,7 +351,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogOrCallback? (pre, ast: AST): boolean;
 >LogOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -359,7 +359,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogAndCallback? (pre, ast: AST): boolean;
 >LogAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -367,7 +367,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         OrCallback? (pre, ast: AST): boolean;
 >OrCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -375,7 +375,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         XorCallback? (pre, ast: AST): boolean;
 >XorCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -383,7 +383,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AndCallback? (pre, ast: AST): boolean;
 >AndCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -391,7 +391,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqCallback? (pre, ast: AST): boolean;
 >EqCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -399,7 +399,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NeCallback? (pre, ast: AST): boolean;
 >NeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -407,7 +407,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqvCallback? (pre, ast: AST): boolean;
 >EqvCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -415,7 +415,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NEqvCallback? (pre, ast: AST): boolean;
 >NEqvCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -423,7 +423,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LtCallback? (pre, ast: AST): boolean;
 >LtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -431,7 +431,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LeCallback? (pre, ast: AST): boolean;
 >LeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -439,7 +439,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GtCallback? (pre, ast: AST): boolean;
 >GtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -447,7 +447,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GeCallback? (pre, ast: AST): boolean;
 >GeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -455,7 +455,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AddCallback? (pre, ast: AST): boolean;
 >AddCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -463,7 +463,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SubCallback? (pre, ast: AST): boolean;
 >SubCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -471,7 +471,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MulCallback? (pre, ast: AST): boolean;
 >MulCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -479,7 +479,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DivCallback? (pre, ast: AST): boolean;
 >DivCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -487,7 +487,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModCallback? (pre, ast: AST): boolean;
 >ModCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -495,7 +495,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LshCallback? (pre, ast: AST): boolean;
 >LshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -503,7 +503,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RshCallback? (pre, ast: AST): boolean;
 >RshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -511,7 +511,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         Rs2Callback? (pre, ast: AST): boolean;
 >Rs2Callback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -519,7 +519,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NotCallback? (pre, ast: AST): boolean;
 >NotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -527,7 +527,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogNotCallback? (pre, ast: AST): boolean;
 >LogNotCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -535,7 +535,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPreCallback? (pre, ast: AST): boolean;
 >IncPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -543,7 +543,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPreCallback? (pre, ast: AST): boolean;
 >DecPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -551,7 +551,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPostCallback? (pre, ast: AST): boolean;
 >IncPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -559,7 +559,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPostCallback? (pre, ast: AST): boolean;
 >DecPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -567,7 +567,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeAssertionCallback? (pre, ast: AST): boolean;
 >TypeAssertionCallback : (pre: any, ast: AST) => boolean
->                      : ^   ^^^^^^^   ^^^^^^^^^^       
+>                      : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -575,7 +575,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FuncDeclCallback? (pre, funcDecl: FuncDecl): boolean;
 >FuncDeclCallback : (pre: any, funcDecl: FuncDecl) => boolean
->                 : ^   ^^^^^^^        ^^^^^^^^^^^^^^^       
+>                 : ^   ^^^^^^^        ^^        ^^^^^       
 >pre : any
 >    : ^^^
 >funcDecl : FuncDecl
@@ -583,7 +583,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MemberCallback? (pre, ast: AST): boolean;
 >MemberCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -591,7 +591,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VarDeclCallback? (pre, varDecl: VarDecl): boolean;
 >VarDeclCallback : (pre: any, varDecl: VarDecl) => boolean
->                : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
+>                : ^   ^^^^^^^       ^^       ^^^^^       
 >pre : any
 >    : ^^^
 >varDecl : VarDecl
@@ -599,7 +599,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArgDeclCallback? (pre, ast: AST): boolean;
 >ArgDeclCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -607,7 +607,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ReturnCallback? (pre, ast: AST): boolean;
 >ReturnCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -615,7 +615,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BreakCallback? (pre, ast: AST): boolean;
 >BreakCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -623,7 +623,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ContinueCallback? (pre, ast: AST): boolean;
 >ContinueCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -631,7 +631,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThrowCallback? (pre, ast: AST): boolean;
 >ThrowCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -639,7 +639,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForCallback? (pre, ast: AST): boolean;
 >ForCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -647,7 +647,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForInCallback? (pre, ast: AST): boolean;
 >ForInCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -655,7 +655,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IfCallback? (pre, ast: AST): boolean;
 >IfCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -663,7 +663,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WhileCallback? (pre, ast: AST): boolean;
 >WhileCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -671,7 +671,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DoWhileCallback? (pre, ast: AST): boolean;
 >DoWhileCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -679,7 +679,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BlockCallback? (pre, block: Block): boolean;
 >BlockCallback : (pre: any, block: Block) => boolean
->              : ^   ^^^^^^^     ^^^^^^^^^^^^       
+>              : ^   ^^^^^^^     ^^     ^^^^^       
 >pre : any
 >    : ^^^
 >block : Block
@@ -687,7 +687,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CaseCallback? (pre, ast: AST): boolean;
 >CaseCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -695,7 +695,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SwitchCallback? (pre, ast: AST): boolean;
 >SwitchCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -703,7 +703,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCallback? (pre, ast: AST): boolean;
 >TryCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -711,7 +711,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCatchCallback? (pre, ast: AST): boolean;
 >TryCatchCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -719,7 +719,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryFinallyCallback? (pre, ast: AST): boolean;
 >TryFinallyCallback : (pre: any, ast: AST) => boolean
->                   : ^   ^^^^^^^   ^^^^^^^^^^       
+>                   : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -727,7 +727,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FinallyCallback? (pre, ast: AST): boolean;
 >FinallyCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -735,7 +735,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CatchCallback? (pre, ast: AST): boolean;
 >CatchCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -743,7 +743,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ListCallback? (pre, astList: ASTList): boolean;
 >ListCallback : (pre: any, astList: ASTList) => boolean
->             : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
+>             : ^   ^^^^^^^       ^^       ^^^^^       
 >pre : any
 >    : ^^^
 >astList : ASTList
@@ -751,7 +751,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ScriptCallback? (pre, script: Script): boolean;
 >ScriptCallback : (pre: any, script: Script) => boolean
->               : ^   ^^^^^^^      ^^^^^^^^^^^^^       
+>               : ^   ^^^^^^^      ^^      ^^^^^       
 >pre : any
 >    : ^^^
 >script : Script
@@ -759,7 +759,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ClassDeclarationCallback? (pre, ast: AST): boolean;
 >ClassDeclarationCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -767,7 +767,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InterfaceDeclarationCallback? (pre, interfaceDecl: InterfaceDeclaration): boolean;
 >InterfaceDeclarationCallback : (pre: any, interfaceDecl: InterfaceDeclaration) => boolean
->                             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^       
+>                             : ^   ^^^^^^^             ^^                    ^^^^^       
 >pre : any
 >    : ^^^
 >interfaceDecl : InterfaceDeclaration
@@ -775,7 +775,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModuleDeclarationCallback? (pre, moduleDecl: ModuleDeclaration): boolean;
 >ModuleDeclarationCallback : (pre: any, moduleDecl: ModuleDeclaration) => boolean
->                          : ^   ^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^       
+>                          : ^   ^^^^^^^          ^^                 ^^^^^       
 >pre : any
 >    : ^^^
 >moduleDecl : ModuleDeclaration
@@ -783,7 +783,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ImportDeclarationCallback? (pre, ast: AST): boolean;
 >ImportDeclarationCallback : (pre: any, ast: AST) => boolean
->                          : ^   ^^^^^^^   ^^^^^^^^^^       
+>                          : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -791,7 +791,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WithCallback? (pre, ast: AST): boolean;
 >WithCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -799,7 +799,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabelCallback? (pre, labelAST: AST): boolean;
 >LabelCallback : (pre: any, labelAST: AST) => boolean
->              : ^   ^^^^^^^        ^^^^^^^^^^       
+>              : ^   ^^^^^^^        ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >labelAST : AST
@@ -807,7 +807,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabeledStatementCallback? (pre, ast: AST): boolean;
 >LabeledStatementCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -815,7 +815,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EBStartCallback? (pre, ast: AST): boolean;
 >EBStartCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -823,7 +823,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GotoEBCallback? (pre, ast: AST): boolean;
 >GotoEBCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -831,7 +831,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EndCodeCallback? (pre, ast: AST): boolean;
 >EndCodeCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -839,7 +839,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ErrorCallback? (pre, ast: AST): boolean;
 >ErrorCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -847,7 +847,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommentCallback? (pre, ast: AST): boolean;
 >CommentCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -855,7 +855,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DebuggerCallback? (pre, ast: AST): boolean;
 >DebuggerCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -863,7 +863,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DefaultCallback? (pre, ast: AST): boolean;
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -872,7 +872,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     export function walk(script: Script, callback: AstWalkerDetailCallback): void {
 >walk : (script: Script, callback: AstWalkerDetailCallback) => void
->     : ^      ^^^^^^^^^^        ^^                       ^^^^^    
+>     : ^      ^^      ^^        ^^                       ^^^^^    
 >script : Script
 >       : ^^^^^^
 >callback : AstWalkerDetailCallback
@@ -880,9 +880,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var pre = (cur: AST, parent: AST) => {
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>    : ^   ^^   ^^      ^^   ^^^^^^^^
 >(cur: AST, parent: AST) => {            walker.options.goChildren = AstWalkerCallback(true, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                                            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -904,7 +904,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(true, cur, callback) : boolean
 >                                       : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >true : true
 >     : ^^^^
 >cur : AST
@@ -919,9 +919,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var post = (cur: AST, parent: AST) => {
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^^^^
 >(cur: AST, parent: AST) => {            AstWalkerCallback(false, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                 : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                                                                                                 : ^   ^^   ^^      ^^   ^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -931,7 +931,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(false, cur, callback) : boolean
 >                                        : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >false : false
 >      : ^^^^^
 >cur : AST
@@ -962,9 +962,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 >getWalker : any
 >          : ^^^
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>    : ^   ^^   ^^      ^^   ^^^^^^^^
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^^^^
 
         walker.walk(script, null);
 >walker.walk(script, null) : any
@@ -981,7 +981,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     function AstWalkerCallback(pre: boolean, ast: AST, callback: AstWalkerDetailCallback): boolean {
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
@@ -1047,21 +1047,21 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         if (callback.DefaultCallback) {
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 
             return callback.DefaultCallback(pre, ast);
 >callback.DefaultCallback(pre, ast) : boolean
 >                                   : ^^^^^^^
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index 15987b2cc71ff..6619d911f4142 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -235,7 +235,7 @@ module TypeScript {
 
         public pop(): TypeScript.AST {
 >pop : () => TypeScript.AST
->    : ^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^              
 >TypeScript : any
 >           : ^^^
 
@@ -304,7 +304,7 @@ module TypeScript {
 
         public push(ast: TypeScript.AST) {
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -469,7 +469,7 @@ module TypeScript {
 
         public nodeType(): TypeScript.NodeType {
 >nodeType : () => TypeScript.NodeType
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^^^^^^                   
 >TypeScript : any
 >           : ^^^
 
@@ -623,7 +623,7 @@ module TypeScript {
 
         public get(index: number): TypeScript.AST {
 >get : (index: number) => TypeScript.AST
->    : ^     ^^      ^^^^^^^^^^^^^^^^^^^
+>    : ^     ^^      ^^^^^              
 >index : number
 >      : ^^^^^^
 >TypeScript : any
@@ -6838,7 +6838,7 @@ module TypeScript {
 
     export function isValidAstNode(ast: TypeScript.ASTSpan): boolean {
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >ast : TypeScript.ASTSpan
 >    : ^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6947,7 +6947,7 @@ module TypeScript {
     ///
     export function getAstPathToPosition(script: TypeScript.AST, pos: number, options = GetAstPathOptions.Default): TypeScript.AstPath {
 >getAstPathToPosition : (script: TypeScript.AST, pos: number, options?: GetAstPathOptions) => TypeScript.AstPath
->                     : ^      ^^^^^^^^^^^^^^^^^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
+>                     : ^      ^^              ^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7079,7 +7079,7 @@ module TypeScript {
 >ctx.path.push(comments[i]) : void
 >                           : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>              : ^   ^^              ^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7087,7 +7087,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >comments[i] : TypeScript.Comment
 >            : ^^^^^^^^^^^^^^^^^^
 >comments : TypeScript.Comment[]
@@ -7101,9 +7101,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {            if (isValidAstNode(cur)) {                // Add "cur" to the stack if it contains our position                // For "identifier" nodes, we need a special case: A position equal to "limChar" is                // valid, since the position corresponds to a caret position (in between characters)                // For example:                //  bar                //  0123                // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid                var inclusive =                    hasFlag(options, GetAstPathOptions.EdgeInclusive) ||                    cur.nodeType === TypeScript.NodeType.Name ||                    pos === script.limChar; // Special "EOF" case                var minChar = cur.minChar;                var limChar = cur.limChar + (inclusive ? 1 : 0)                if (pos >= minChar && pos < limChar) {                    // TODO: Since AST is sometimes not correct wrt to position, only add "cur" if it's better                    //       than top of the stack.                    var previous = ctx.path.ast();                    if (previous == null || (cur.minChar >= previous.minChar && cur.limChar <= previous.limChar)) {                        ctx.path.push(cur);                    }                    else {                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");                    }                }                // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually                if (pos < limChar) {                    lookInComments(cur.preComments);                }                if (pos >= minChar) {                    lookInComments(cur.postComments);                }                if (!hasFlag(options, GetAstPathOptions.DontPruneSearchBasedOnPosition)) {                    // Don't go further down the tree if pos is outside of [minChar, limChar]                    walker.options.goChildren = (minChar <= pos && pos <= limChar);                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7119,7 +7119,7 @@ module TypeScript {
 >isValidAstNode(cur) : boolean
 >                    : ^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7294,7 +7294,7 @@ module TypeScript {
 >ctx.path.push(cur) : void
 >                   : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>              : ^   ^^              ^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7302,7 +7302,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
                     }
@@ -7432,7 +7432,7 @@ module TypeScript {
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >ctx : AstPathContext
 >    : ^^^^^^^^^^^^^^
 
@@ -7451,7 +7451,7 @@ module TypeScript {
     //
     export function getTokenizationOffset(script: TypeScript.Script, position: number): number {
 >getTokenizationOffset : (script: TypeScript.Script, position: number) => number
->                      : ^      ^^^^^^^^^^^^^^^^^^^^^        ^^      ^^^^^      
+>                      : ^      ^^                 ^^        ^^      ^^^^^      
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7467,9 +7467,9 @@ module TypeScript {
 
         var pre = (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 >(cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {            if (TypeScript.isValidAstNode(cur)) {                // Did we find a closer offset?                if (cur.minChar <= position) {                    bestOffset = max(bestOffset, cur.minChar);                }                // Stop the walk if this node is not related to "minChar"                if (cur.minChar > position || cur.limChar < bestOffset) {                    walker.options.goChildren = false;                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7489,11 +7489,11 @@ module TypeScript {
 >TypeScript.isValidAstNode(cur) : boolean
 >                               : ^^^^^^^
 >TypeScript.isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>                          : ^   ^^                  ^^^^^       
 >TypeScript : typeof TypeScript
 >           : ^^^^^^^^^^^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7595,7 +7595,7 @@ module TypeScript {
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 
         return bestOffset;
 >bestOffset : number
@@ -7607,13 +7607,13 @@ module TypeScript {
     ///
     export function walkAST(ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void ): void {
 >walkAST : (ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void) => void
->        : ^   ^^^^^^^^^^^^^^^^^^        ^^                                                      ^^^^^    
+>        : ^   ^^              ^^        ^^                                                      ^^^^^    
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>         : ^    ^^       ^^      ^^                     ^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7623,9 +7623,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.push(cur);            callback(path, walker);            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                              : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                              : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7655,11 +7655,11 @@ module TypeScript {
 >path.push(cur) : void
 >               : ^^^^
 >path.push : (ast: TypeScript.AST) => void
->          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>          : ^   ^^              ^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7667,7 +7667,7 @@ module TypeScript {
 >callback(path, walker) : void
 >                       : ^^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>         : ^    ^^       ^^      ^^                     ^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7679,9 +7679,9 @@ module TypeScript {
         }
         var post = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.pop();            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                       : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                       : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7711,11 +7711,11 @@ module TypeScript {
 >path.pop() : TypeScript.AST
 >           : ^^^^^^^^^^^^^^
 >path.pop : () => TypeScript.AST
->         : ^^^^^^^^^^^^^^^^^^^^
+>         : ^^^^^^              
 >path : AstPath
 >     : ^^^^^^^
 >pop : () => TypeScript.AST
->    : ^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^              
 
             return cur;
 >cur : TypeScript.AST
@@ -7748,9 +7748,9 @@ module TypeScript {
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
     }
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 5705a96538950..8f3ed1a4a4b1f 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -285,7 +285,7 @@ module TypeScript {
 
     export function prePrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >prePrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->            : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -335,7 +335,7 @@ module TypeScript {
 
     export function postPrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >postPrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->             : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>             : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types
index 19d355f02ffdc..0ca3b7cf60791 100644
--- a/tests/baselines/reference/parserRealSource6.types
+++ b/tests/baselines/reference/parserRealSource6.types
@@ -66,11 +66,11 @@ module TypeScript {
 
         public scopeGetter: () => SymbolScope = null;
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 
         public objectLiteralScopeGetter: () => SymbolScope = null;
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
 
         public scopeStartAST: AST = null;
 >scopeStartAST : AST
@@ -133,32 +133,32 @@ module TypeScript {
 
         public getScope(): SymbolScope {
 >getScope : () => SymbolScope
->         : ^^^^^^^^^^^^^^^^^
+>         : ^^^^^^           
 
             return this.scopeGetter();
 >this.scopeGetter() : SymbolScope
 >                   : ^^^^^^^^^^^
 >this.scopeGetter : () => SymbolScope
->                 : ^^^^^^^^^^^^^^^^^
+>                 : ^^^^^^           
 >this : this
 >     : ^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
         }
 
         public getObjectLiteralScope(): SymbolScope {
 >getObjectLiteralScope : () => SymbolScope
->                      : ^^^^^^^^^^^^^^^^^
+>                      : ^^^^^^           
 
             return this.objectLiteralScopeGetter();
 >this.objectLiteralScopeGetter() : SymbolScope
 >                                : ^^^^^^^^^^^
 >this.objectLiteralScopeGetter : () => SymbolScope
->                              : ^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^           
 >this : this
 >     : ^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
         }
 
         public getScopeAST() {
@@ -193,7 +193,7 @@ module TypeScript {
 
         public getScriptFragmentStartAST(): AST {
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 
             return this.scopeStartAST;
 >this.scopeStartAST : AST
@@ -214,18 +214,18 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^^^^
+>                               : ^^^^^^   
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 >minChar : any
 >        : ^^^
         }
 
         public getScriptFragment(): Script {
 >getScriptFragment : () => Script
->                  : ^^^^^^^^^^^^
+>                  : ^^^^^^      
 
             if (this.scriptFragment == null) {
 >this.scriptFragment == null : boolean
@@ -243,11 +243,11 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^^^^
+>                               : ^^^^^^   
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 
                 var minChar = ast.minChar;
 >minChar : any
@@ -341,7 +341,7 @@ module TypeScript {
 
     export function preFindMemberScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindMemberScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                   : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                   : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -508,7 +508,7 @@ module TypeScript {
 
     export function pushTypeCollectionScope(container: Symbol,
 >pushTypeCollectionScope : (container: Symbol, valueMembers: ScopedMembers, ambientValueMembers: ScopedMembers, enclosedTypes: ScopedMembers, ambientEnclosedTypes: ScopedMembers, context: TypeCollectionContext, thisType: Type, classType: Type, moduleDecl: ModuleDeclaration) => void
->                        : ^         ^^      ^^            ^^^^^^^^^^^^^^^^^                   ^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^                    ^^^^^^^^^^^^^^^^^       ^^                     ^^        ^^^^^^^^         ^^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^         ^^      ^^            ^^             ^^                   ^^             ^^             ^^             ^^                    ^^             ^^       ^^                     ^^        ^^    ^^         ^^    ^^          ^^                 ^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 
@@ -658,7 +658,7 @@ module TypeScript {
 
     export function preFindEnclosingScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -796,11 +796,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                         : ^^^^^^^^^
 
@@ -853,11 +853,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                     : ^^^^^^^^^
 
@@ -965,11 +965,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                                                    : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                              : ^^^^^^^^^
 
@@ -990,11 +990,11 @@ module TypeScript {
 >context.objectLiteralScopeGetter = function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                                                              : ^^^^^^^^^
 >context.objectLiteralScopeGetter : () => SymbolScope
->                                 : ^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
 >function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                           : ^^^^^^^^^
 
@@ -1050,11 +1050,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                     : ^^^^^^^^^
 
@@ -1107,11 +1107,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                             : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                       : ^^^^^^^^^
 
@@ -1195,11 +1195,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         : ^^^^^^^^^
 
@@ -1371,7 +1371,7 @@ module TypeScript {
     //
     export function findEnclosingScopeAt(logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean): EnclosingScopeContext {
 >findEnclosingScopeAt : (logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean) => EnclosingScopeContext
->                     : ^      ^^^^^^^^^^^      ^^^^^^^^^^    ^^^^^^^^^^^^^^^   ^^      ^^                  ^^       ^^^^^                     
+>                     : ^      ^^       ^^      ^^      ^^    ^^           ^^   ^^      ^^                  ^^       ^^^^^                     
 >logger : ILogger
 >       : ^^^^^^^
 >script : Script
@@ -1419,7 +1419,7 @@ module TypeScript {
 >script : Script
 >       : ^^^^^^
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index ac67b62fabd65..8b2d40b9c40ca 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -29,7 +29,7 @@ module TypeScript {
 
     function getBaseTypeLinks(bases: ASTList, baseTypeLinks: TypeLink[]) {
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >bases : ASTList
 >      : ^^^^^^^
 >baseTypeLinks : TypeLink[]
@@ -153,7 +153,7 @@ module TypeScript {
 
     function getBases(type: Type, typeDecl: TypeDeclaration) {
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >type : Type
 >     : ^^^^
 >typeDecl : TypeDeclaration
@@ -171,7 +171,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks) : TypeLink[]
 >                                                              : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.extendsList : any
 >                     : ^^^
 >typeDecl : TypeDeclaration
@@ -197,7 +197,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.implementsList, type.implementsTypeLinks) : TypeLink[]
 >                                                                    : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.implementsList : any
 >                        : ^^^
 >typeDecl : TypeDeclaration
@@ -214,7 +214,7 @@ module TypeScript {
 
     function addPrototypeField(classType: Type, ast: AST, context: TypeCollectionContext) {
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >ast : AST
@@ -389,7 +389,7 @@ module TypeScript {
 
     export function createNewConstructGroupForType(type: Type) {
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >type : Type
 >     : ^^^^
 
@@ -480,7 +480,7 @@ module TypeScript {
 
     export function cloneParentConstructGroupForChildType(child: Type, parent: Type) {
 >cloneParentConstructGroupForChildType : (child: Type, parent: Type) => void
->                                      : ^     ^^^^^^^^      ^^^^^^^^^^^^^^^
+>                                      : ^     ^^    ^^      ^^    ^^^^^^^^^
 >child : Type
 >      : ^^^^
 >parent : Type
@@ -518,7 +518,7 @@ module TypeScript {
 >createNewConstructGroupForType(parent) : void
 >                                       : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >parent : Type
 >       : ^^^^
         }
@@ -748,7 +748,7 @@ module TypeScript {
 
     function findTypeSymbolInScopeChain(name: string, scopeChain: ScopeChain): Symbol {
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain : ScopeChain
@@ -798,7 +798,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, scopeChain.previous) : Symbol
 >                                                      : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain.previous : any
@@ -816,7 +816,7 @@ module TypeScript {
 
     function findSymbolFromAlias(alias: AST, context: IAliasScopeContext): Symbol {
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >alias : AST
 >      : ^^^
 >context : IAliasScopeContext
@@ -903,7 +903,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, context.topLevelScope) : Symbol
 >                                                        : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : any
 >     : ^^^
 >context.topLevelScope : ScopeChain
@@ -1001,7 +1001,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand1, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >dottedExpr.operand1 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1033,7 +1033,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand2, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >dottedExpr.operand2 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1110,7 +1110,7 @@ module TypeScript {
 
     export function preCollectImportTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -1171,7 +1171,7 @@ module TypeScript {
 >findSymbolFromAlias(importDecl.alias, { topLevelScope: scopeChain, members: null, tcContext: context }) : Symbol
 >                                                                                                        : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >importDecl.alias : any
 >                 : ^^^
 >importDecl : ImportDeclaration
@@ -1464,7 +1464,7 @@ module TypeScript {
 
     export function preCollectModuleTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -2586,7 +2586,7 @@ module TypeScript {
 
     export function preCollectClassTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3140,7 +3140,7 @@ module TypeScript {
 >addPrototypeField(classType, classDecl, context) : void
 >                                                 : ^^^^
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >classDecl : ClassDeclaration
@@ -3806,7 +3806,7 @@ module TypeScript {
 >createNewConstructGroupForType(classDecl.type) : void
 >                                               : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >classDecl.type : any
 >               : ^^^
 >classDecl : ClassDeclaration
@@ -3851,7 +3851,7 @@ module TypeScript {
 >getBases(instanceType, classDecl) : void
 >                                  : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >instanceType : Type
 >             : ^^^^
 >classDecl : ClassDeclaration
@@ -3892,7 +3892,7 @@ module TypeScript {
 
     export function preCollectInterfaceTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4244,7 +4244,7 @@ module TypeScript {
 >getBases(interfaceType, interfaceDecl) : void
 >                                       : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >interfaceType : Type
 >              : ^^^^
 >interfaceDecl : InterfaceDeclaration
@@ -4393,7 +4393,7 @@ module TypeScript {
 
     export function preCollectArgDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4696,7 +4696,7 @@ module TypeScript {
 
     export function preCollectVarDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -5568,7 +5568,7 @@ module TypeScript {
 
     export function preCollectFuncDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7455,7 +7455,7 @@ module TypeScript {
 
     export function preCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >preCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7581,7 +7581,7 @@ module TypeScript {
 >preCollectImportTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7637,7 +7637,7 @@ module TypeScript {
 >preCollectModuleTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7669,7 +7669,7 @@ module TypeScript {
 >preCollectClassTypes(ast, parent, context) : boolean
 >                                           : ^^^^^^^
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7725,7 +7725,7 @@ module TypeScript {
 >preCollectInterfaceTypes(ast, parent, context) : boolean
 >                                               : ^^^^^^^
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7759,7 +7759,7 @@ module TypeScript {
 >preCollectArgDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7791,7 +7791,7 @@ module TypeScript {
 >preCollectVarDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7823,7 +7823,7 @@ module TypeScript {
 >preCollectFuncDeclTypes(ast, parent, context) : boolean
 >                                              : ^^^^^^^
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7896,7 +7896,7 @@ module TypeScript {
 
     export function postCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >postCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types
index d5273187496c0..011cf47ae9f94 100644
--- a/tests/baselines/reference/parserRealSource8.types
+++ b/tests/baselines/reference/parserRealSource8.types
@@ -30,7 +30,7 @@ module TypeScript {
 
     export function pushAssignScope(scope: SymbolScope,
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 
@@ -317,7 +317,7 @@ module TypeScript {
 
     export function preAssignModuleScopes(ast: AST, context: AssignScopeContext) {
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -540,7 +540,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -614,7 +614,7 @@ module TypeScript {
 
     export function preAssignClassScopes(ast: AST, context: AssignScopeContext) {
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -887,7 +887,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, instanceType, classType, null) : void
 >                                                                  : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -934,7 +934,7 @@ module TypeScript {
 
     export function preAssignInterfaceScopes(ast: AST, context: AssignScopeContext) {
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1097,7 +1097,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -1118,7 +1118,7 @@ module TypeScript {
 
     export function preAssignWithScopes(ast: AST, context: AssignScopeContext) {
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1326,7 +1326,7 @@ module TypeScript {
 >pushAssignScope(withScope, context, null, null, null) : void
 >                                                      : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >withScope : any
 >          : ^^^
 >context : AssignScopeContext
@@ -1347,7 +1347,7 @@ module TypeScript {
 
     export function preAssignFuncDeclScopes(ast: AST, context: AssignScopeContext) {
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3274,7 +3274,7 @@ module TypeScript {
 >pushAssignScope(locals, context, thisType, null, funcDecl) : void
 >                                                           : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >locals : any
 >       : ^^^
 >context : AssignScopeContext
@@ -3288,7 +3288,7 @@ module TypeScript {
 
     export function preAssignCatchScopes(ast: AST, context: AssignScopeContext) {
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3382,7 +3382,7 @@ module TypeScript {
 >pushAssignScope(catchLocals, context, context.scopeChain.thisType, context.scopeChain.classType, context.scopeChain.fnc) : void
 >                                                                                                                         : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >catchLocals : any
 >            : ^^^
 >context : AssignScopeContext
@@ -3422,7 +3422,7 @@ module TypeScript {
 
     export function preAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >preAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3514,7 +3514,7 @@ module TypeScript {
 >preAssignModuleScopes(ast, context) : void
 >                                    : ^^^^
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3540,7 +3540,7 @@ module TypeScript {
 >preAssignClassScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3566,7 +3566,7 @@ module TypeScript {
 >preAssignInterfaceScopes(ast, context) : void
 >                                       : ^^^^
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3592,7 +3592,7 @@ module TypeScript {
 >preAssignWithScopes(ast, context) : void
 >                                  : ^^^^
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3618,7 +3618,7 @@ module TypeScript {
 >preAssignFuncDeclScopes(ast, context) : void
 >                                      : ^^^^
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3644,7 +3644,7 @@ module TypeScript {
 >preAssignCatchScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3698,7 +3698,7 @@ module TypeScript {
 
     export function postAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >postAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index cde69fbfba44a..ab395310ba98b 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -20,7 +20,7 @@ module TypeScript {
 
         public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) {
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >typeLinks : TypeLink[]
 >          : ^^^^^^^^^^
 >scope : SymbolScope
@@ -194,7 +194,7 @@ module TypeScript {
 
         public resolveBases(scope: SymbolScope, type: Type) {
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>             : ^     ^^           ^^    ^^    ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -212,11 +212,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.extendsTypeLinks, scope) : Type[]
 >                                                        : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >type.extendsTypeLinks : any
 >                      : ^^^
 >type : Type
@@ -452,11 +452,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.implementsTypeLinks, scope) : Type[]
 >                                                           : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >type.implementsTypeLinks : any
 >                         : ^^^
 >type : Type
@@ -589,7 +589,7 @@ module TypeScript {
 
         public resolveSignatureGroup(signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) {
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >signatureGroup : SignatureGroup
 >               : ^^^^^^^^^^^^^^
 >scope : SymbolScope
@@ -732,11 +732,11 @@ module TypeScript {
 >this.bindSymbol(scope, signature.parameters[j]) : void
 >                                                : ^^^^
 >this.bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->                : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>                : ^     ^^           ^^      ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>           : ^     ^^           ^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >signature.parameters[j] : any
@@ -887,7 +887,7 @@ module TypeScript {
 
         public bindType(scope: SymbolScope, type: Type, instanceType: Type): void {
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -903,11 +903,11 @@ module TypeScript {
 >this.bindType(scope, instanceType, null) : void
 >                                         : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >instanceType : Type
@@ -1115,11 +1115,11 @@ module TypeScript {
 >this.bind(agg, type.members.allMembers) : void
 >                                        : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >type.members.allMembers : any
@@ -1141,11 +1141,11 @@ module TypeScript {
 >this.bind(agg, typeMembers.allMembers) : void
 >                                       : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >typeMembers.allMembers : any
@@ -1163,11 +1163,11 @@ module TypeScript {
 >this.bind(agg, ambientMembers.allMembers) : void
 >                                          : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientMembers.allMembers : any
@@ -1185,11 +1185,11 @@ module TypeScript {
 >this.bind(agg, ambientTypeMembers.allMembers) : void
 >                                              : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientTypeMembers.allMembers : any
@@ -1243,11 +1243,11 @@ module TypeScript {
 >this.resolveBases(scope, type) : void
 >                               : ^^^^
 >this.resolveBases : (scope: SymbolScope, type: Type) => void
->                  : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>                  : ^     ^^           ^^    ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>             : ^     ^^           ^^    ^^    ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -1265,11 +1265,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.construct, scope, instanceType) : void
 >                                                                : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.construct : any
 >               : ^^^
 >type : Type
@@ -1293,11 +1293,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.call, scope, null) : void
 >                                                   : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.call : any
 >          : ^^^
 >type : Type
@@ -1319,11 +1319,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.index, scope, null) : void
 >                                                    : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.index : any
 >           : ^^^
 >type : Type
@@ -1345,11 +1345,11 @@ module TypeScript {
 >this.bindType(scope, type.elementType, null) : void
 >                                             : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type.elementType : any
@@ -1363,7 +1363,7 @@ module TypeScript {
 
         public bindSymbol(scope: SymbolScope, symbol: Symbol) {
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>           : ^     ^^           ^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >symbol : Symbol
@@ -1715,11 +1715,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.type, typeSymbol.instanceType) : void
 >                                                               : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.type : any
@@ -1778,11 +1778,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.expansions[i], typeSymbol.instanceType) : void
 >                                                                        : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.expansions[i] : any
@@ -1925,7 +1925,7 @@ module TypeScript {
 
         public bind(scope: SymbolScope, table: IHashTable) {
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >table : IHashTable
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.types b/tests/baselines/reference/parserUnterminatedGeneric1.types
index 12c025090c4b2..549ca935c184d 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.types
@@ -4,7 +4,7 @@
  interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^^^^^^^^^
+>    : ^        ^^               ^^^^^        
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types
index 2f5be1ab9ff4c..b947eed9d1388 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.types
@@ -39,7 +39,7 @@ declare module ng {
     interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^^^^^^^^^
+>    : ^        ^^               ^^^^^        
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.types b/tests/baselines/reference/parserX_ArrowFunction1.types
index 9231ec5c45df6..b81026b7751d5 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.types
+++ b/tests/baselines/reference/parserX_ArrowFunction1.types
@@ -3,9 +3,9 @@
 === parserX_ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>  : ^ ^^   ^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^^^^^^^^^^^^^
+>               : ^ ^^   ^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index 2828e5164aaf3..0326d8453ba19 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -4320,7 +4320,7 @@ module Harness {
             /** create file gets the whole path to create, so this works as expected with the --out parameter */
             public createFile(s: string, useUTF8?: boolean): ITextWriter {
 >createFile : (s: string, useUTF8?: boolean) => ITextWriter
->           : ^ ^^      ^^       ^^^       ^^^^^^^^^^^^^^^^
+>           : ^ ^^      ^^       ^^^       ^^^^^           
 >s : string
 >  : ^^^^^^
 >useUTF8 : boolean
@@ -4687,7 +4687,7 @@ module Harness {
 
         export function makeDefaultCompilerForTest(c?: TypeScript.TypeScriptCompiler) {
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^ ^^^                             ^^^^^^^^
 >c : TypeScript.TypeScriptCompiler
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6448,11 +6448,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^              ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6602,11 +6602,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^              ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6816,7 +6816,7 @@ module Harness {
 
             private getTypeInfoName(ast : TypeScript.AST) {
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8329,7 +8329,7 @@ module Harness {
 >makeDefaultCompilerForTest() : any
 >                             : ^^^
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^ ^^^                             ^^^^^^^^
 
             if (usePull) {
 >usePull : boolean
@@ -8733,7 +8733,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8797,7 +8797,7 @@ module Harness {
 >callback : (res: CompilerResult) => void
 >         : ^   ^^              ^^^^^    
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >context : CompilationContext
 >        : ^^^^^^^^^^^^^^^^^^
 >references : TypeScript.IFileReference[]
@@ -8816,7 +8816,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8931,13 +8931,13 @@ module Harness {
 
             if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 
                 settingsCallback(compiler.settings);
 >settingsCallback(compiler.settings) : void
 >                                    : ^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >compiler.settings : any
 >                  : ^^^
 >compiler : TypeScript.TypeScriptCompiler
@@ -8991,7 +8991,7 @@ module Harness {
                 // So that a test doesn't have side effects for tests run after it, restore the compiler settings to their previous state.
                 if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 
                     compiler.settings = oldCompilerSettings;
 >compiler.settings = oldCompilerSettings : any
@@ -9184,7 +9184,7 @@ module Harness {
 
         export function emit(ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) {
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >ioHost : TypeScript.EmitterIOHost
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -9360,7 +9360,7 @@ module Harness {
 >emit(stdout, true) : void
 >                   : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >true : true
@@ -9383,7 +9383,7 @@ module Harness {
 >emit(stdout, false) : void
 >                    : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >false : false
@@ -10326,7 +10326,7 @@ module Harness {
 
         public editRanges: { length: number; editRange: TypeScript.ScriptEditRange; }[] = [];
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >editRange : TypeScript.ScriptEditRange
@@ -10371,11 +10371,11 @@ module Harness {
 >this.editRanges = [] : undefined[]
 >                     : ^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -10494,15 +10494,15 @@ module Harness {
 >this.editRanges.push({                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            }) : number
 >                                                                                                                                                                                                  : ^^^^^^
 >this.editRanges.push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
 >{                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            } : { length: number; editRange: any; }
 >                                                                                                                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -10560,11 +10560,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >this.maxScriptVersions : number
@@ -10576,17 +10576,17 @@ module Harness {
 
                 this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length);
 >this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
 >0 : 0
 >  : ^
 >this.maxScriptVersions - this.editRanges.length : number
@@ -10600,11 +10600,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
             }
@@ -10623,7 +10623,7 @@ module Harness {
 
         public getEditRangeSinceVersion(version: number): TypeScript.ScriptEditRange {
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^       ^^      ^^^^^                          
 >version : number
 >        : ^^^^^^
 >TypeScript : any
@@ -10653,11 +10653,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >(this.version - version) : number
@@ -10689,11 +10689,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -10715,19 +10715,19 @@ module Harness {
 
             var entries = this.editRanges.slice(initialEditRangeIndex);
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.slice(initialEditRangeIndex) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >initialEditRangeIndex : number
 >                      : ^^^^^^
 
@@ -10741,21 +10741,21 @@ module Harness {
 >entries.map(x => x.editRange.minChar) : any[]
 >                                      : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.minChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.editRange.minChar : any
 >                    : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -10791,21 +10791,21 @@ module Harness {
 >entries.map(x => x.length - x.editRange.limChar) : number[]
 >                                                 : ^^^^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.length - x.editRange.limChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => number
->                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.length - x.editRange.limChar : number
 >                               : ^^^^^^
 >x.length : number
 >         : ^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >length : number
 >       : ^^^^^^
 >x.editRange.limChar : any
@@ -10813,7 +10813,7 @@ module Harness {
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >limChar : any
@@ -10849,21 +10849,21 @@ module Harness {
 >entries.map(x => x.editRange.delta) : any[]
 >                                    : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.delta : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.editRange.delta : any
 >                  : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >delta : any
@@ -10899,9 +10899,9 @@ module Harness {
 >entries[0].length : number
 >                  : ^^^^^^
 >entries[0] : { length: number; editRange: TypeScript.ScriptEditRange; }
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >0 : 0
 >  : ^
 >length : number
@@ -11495,7 +11495,7 @@ module Harness {
 >this.scripts[scriptIndex].getEditRangeSinceVersion(scriptVersion) : TypeScript.ScriptEditRange
 >                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex].getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                                                   : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                   : ^       ^^      ^^^^^                          
 >this.scripts[scriptIndex] : ScriptInfo
 >                          : ^^^^^^^^^^
 >this.scripts : ScriptInfo[]
@@ -11507,7 +11507,7 @@ module Harness {
 >scriptIndex : number
 >            : ^^^^^^
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^       ^^      ^^^^^                          
 >scriptVersion : number
 >              : ^^^^^^
 
@@ -11557,7 +11557,7 @@ module Harness {
          */
         public getLanguageService(): Services.ILanguageServiceShim {
 >getLanguageService : () => Services.ILanguageServiceShim
->                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                   : ^^^^^^                             
 >Services : any
 >         : ^^^
 
@@ -11613,7 +11613,7 @@ module Harness {
         /** Parse file given its source text */
         public parseSourceText(fileName: string, sourceText: TypeScript.ISourceText): TypeScript.Script {
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^        ^^      ^^          ^^                      ^^^^^                 
 >fileName : string
 >         : ^^^^^^
 >sourceText : TypeScript.ISourceText
@@ -11721,11 +11721,11 @@ module Harness {
 >this.parseSourceText(fileName, sourceText) : TypeScript.Script
 >                                           : ^^^^^^^^^^^^^^^^^
 >this.parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                     : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^        ^^      ^^          ^^                      ^^^^^                 
 >this : this
 >     : ^^^^
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^        ^^      ^^          ^^                      ^^^^^                 
 >fileName : string
 >         : ^^^^^^
 >sourceText : any
@@ -11871,7 +11871,7 @@ module Harness {
         */
         public positionToZeroBasedLineCol(fileName: string, position: number): TypeScript.ILineCol {
 >positionToZeroBasedLineCol : (fileName: string, position: number) => TypeScript.ILineCol
->                           : ^        ^^      ^^        ^^      ^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^        ^^      ^^        ^^      ^^^^^                   
 >fileName : string
 >         : ^^^^^^
 >position : number
@@ -12279,25 +12279,25 @@ module Harness {
 
             var temp = mapEdits(edits).sort(function (a, b) {
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort(function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            }) : { edit: Services.TextEdit; index: number; }[]
->                                                                                                                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                                                                                                                                                                                                                               : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->                     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits) : { edit: Services.TextEdit; index: number; }[]
->                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits : (edits: Services.TextEdit[]) => { edit: Services.TextEdit; index: number; }[]
 >         : ^     ^^                   ^^^^^                                             
 >edits : Services.TextEdit[]
 >      : ^^^^^^^^^^^^^^^^^^^
 >sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            } : (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number
->                                                                                                                                                                                                         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
+>                                                                                                                                                                                                         : ^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 
                 var result = a.edit.minChar - b.edit.minChar;
 >result : number
@@ -12309,7 +12309,7 @@ module Harness {
 >a.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12319,7 +12319,7 @@ module Harness {
 >b.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12343,13 +12343,13 @@ module Harness {
 >a.index : number
 >        : ^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 >b.index : number
 >        : ^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 
@@ -12379,7 +12379,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12389,9 +12389,9 @@ module Harness {
 >temp[current].edit : Services.TextEdit
 >                   : ^^^^^^^^^^^^^^^^^
 >temp[current] : { edit: Services.TextEdit; index: number; }
->              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>              : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >current : number
 >        : ^^^^^^
 >edit : Services.TextEdit
@@ -12406,7 +12406,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12436,9 +12436,9 @@ module Harness {
 >temp[next].edit : Services.TextEdit
 >                : ^^^^^^^^^^^^^^^^^
 >temp[next] : { edit: Services.TextEdit; index: number; }
->           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>           : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >next : number
 >     : ^^^^^^
 >edit : Services.TextEdit
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index 773edd88ec266..0d93f460d18e4 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -145,11 +145,11 @@ module Formatting {
 >this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree) : void
 >                                                                          : ^^^^
 >this.ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                                 : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                                 : ^                       ^^      ^^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                            : ^                       ^^      ^^    ^^         ^^^^^    
 >this.languageHostIndentation : string
 >                             : ^^^^^^
 >this : this
@@ -167,11 +167,11 @@ module Formatting {
 >this.FillInheritedIndentation(this.tree) : void
 >                                         : ^^^^
 >this.FillInheritedIndentation : (tree: ParseTree) => void
->                              : ^    ^^^^^^^^^^^^^^^^    
+>                              : ^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^^^^^^^^^^^^^^^    
+>                         : ^    ^^         ^^^^^    
 >this.tree : ParseTree
 >          : ^^^^^^^^^
 >this : this
@@ -183,7 +183,7 @@ module Formatting {
 
         public GetIndentationEdits(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEdits : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                    : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                    : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -332,11 +332,11 @@ module Formatting {
 >this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent) : List_TextEditInfo
 >                                                                       : ^^^^^^^^^^^^^^^^^
 >this.GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                               : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                               : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >this : this
 >     : ^^^^
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -477,7 +477,7 @@ module Formatting {
 
         public GetIndentationEditsWorker(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -513,11 +513,11 @@ module Formatting {
 >this.AdjustStartOffsetIfNeeded(token, node) : void
 >                                            : ^^^^
 >this.AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                               : ^     ^^         ^^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                          : ^     ^^         ^^    ^^         ^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -558,11 +558,11 @@ module Formatting {
 >this.IsMultiLineString(token) : boolean
 >                              : ^^^^^^^
 >this.IsMultiLineString : (token: TokenSpan) => boolean
->                       : ^     ^^^^^^^^^^^^^^^^       
+>                       : ^     ^^         ^^^^^       
 >this : this
 >     : ^^^^
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^^^^^^^^^^^^^^^       
+>                  : ^     ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -580,11 +580,11 @@ module Formatting {
 >this.GetSpecialCaseIndentation(token, node) : IndentationInfo
 >                                            : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                               : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -811,11 +811,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                     : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -837,11 +837,11 @@ module Formatting {
 >this.GetIndentEdit(indentationInfo, token.Span.startPosition(), sameLineIndent) : TextEditInfo
 >                                                                                : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >indentationInfo : IndentationInfo
 >                : ^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
@@ -869,11 +869,11 @@ module Formatting {
 >this.RegisterIndentation(edit, sameLineIndent) : void
 >                                               : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                         : ^      ^^            ^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >edit : TextEditInfo
 >     : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -914,11 +914,11 @@ module Formatting {
 >this.GetCommentIndentationEdits(token) : List_TextEditInfo
 >                                       : ^^^^^^^^^^^^^^^^^
 >this.GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                                : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^^^^                 
 >this : this
 >     : ^^^^
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^     ^^         ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -960,7 +960,7 @@ module Formatting {
 
         private GetCommentIndentationEdits(token: TokenSpan): List_TextEditInfo {
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^     ^^         ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -1140,11 +1140,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(lineIndent, commentFirstLineIndentationDelta) : IndentationInfo
 >                                                                          : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^             ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >lineIndent : string
 >           : ^^^^^^
 >commentFirstLineIndentationDelta : number
@@ -1176,11 +1176,11 @@ module Formatting {
 >this.GetIndentEdit(commentIndentationInfo, tokenStartPosition, false) : TextEditInfo
 >                                                                      : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >commentIndentationInfo : IndentationInfo
 >                       : ^^^^^^^^^^^^^^^
 >tokenStartPosition : any
@@ -1217,7 +1217,7 @@ module Formatting {
 
         static GetIndentSizeFromIndentText(indentText: string, editorOptions: Services.EditorOptions): number {
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >indentText : string
 >           : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1240,7 +1240,7 @@ module Formatting {
 
         static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number {
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >text : string
 >     : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1371,7 +1371,7 @@ module Formatting {
 
         private GetSpecialCaseIndentation(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1405,11 +1405,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForLCurly(node) : IndentationInfo
 >                                              : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                        : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                        : ^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                   : ^    ^^         ^^^^^               
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1605,11 +1605,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForSemicolon(token, node) : IndentationInfo
 >                                                        : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                           : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                           : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1627,11 +1627,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForComment(token, node) : IndentationInfo
 >                                                      : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                         : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                         : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1646,7 +1646,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForLCurly(node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                   : ^    ^^         ^^^^^               
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1805,7 +1805,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForSemicolon(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1941,7 +1941,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForComment(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2058,11 +2058,11 @@ module Formatting {
 >this.CanIndentComment(token, node) : boolean
 >                                   : ^^^^^^^
 >this.CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                      : ^     ^^         ^^    ^^         ^^^^^       
 >this : this
 >     : ^^^^
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                 : ^     ^^         ^^    ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2093,11 +2093,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                     : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2112,7 +2112,7 @@ module Formatting {
 
         private CanIndentComment(token: TokenSpan, node: ParseNode): boolean {
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                 : ^     ^^         ^^    ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2339,7 +2339,7 @@ module Formatting {
 
         private ApplyScriptBlockIndentation(languageHostIndentation: string, tree: ParseTree): void
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                            : ^                       ^^      ^^    ^^         ^^^^^    
 >languageHostIndentation : string
 >                        : ^^^^^^
 >tree : ParseTree
@@ -2441,7 +2441,7 @@ module Formatting {
 
         private GetIndentEdit(indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean): TextEditInfo {
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >indentInfo : IndentationInfo
 >           : ^^^^^^^^^^^^^^^
 >tokenStartPosition : number
@@ -3005,7 +3005,7 @@ module Formatting {
 
         private  ApplyIndentationDeltaFromParent(token: TokenSpan, node: ParseNode): IndentationInfo {
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -3135,11 +3135,11 @@ module Formatting {
 >this.ApplyIndentationDelta1(token.Span.startPosition(), parentIndentationDeltaSize) : IndentationInfo
 >                                                                                    : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                            : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^                  ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^                  ^^      ^^     ^^      ^^^^^               
 >token.Span.startPosition() : any
 >                           : ^^^
 >token.Span.startPosition : any
@@ -3164,7 +3164,7 @@ module Formatting {
 
         private ApplyIndentationDelta1(tokenStartPosition: number, delta: number): IndentationInfo {
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^                  ^^      ^^     ^^      ^^^^^               
 >tokenStartPosition : number
 >                   : ^^^^^^
 >delta : number
@@ -3240,11 +3240,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(currentIndent, delta) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^             ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >currentIndent : any
 >              : ^^^
 >delta : number
@@ -3253,7 +3253,7 @@ module Formatting {
 
         private ApplyIndentationDelta2(currentIndent: string, delta: number): IndentationInfo {
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >currentIndent : string
 >              : ^^^^^^
 >delta : number
@@ -3275,11 +3275,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(currentIndent, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >currentIndent : string
 >              : ^^^^^^
 >this.editorOptions : Services.EditorOptions
@@ -3499,11 +3499,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromText(origIndentText, this.editorOptions, /*includeNonIndentChars*/true) : number
 >                                                                                                  : ^^^^^^
 >Indenter.GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                               : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                               : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3521,11 +3521,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(newIndentText, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >newIndentText : any
 >              : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3613,11 +3613,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(childIndentText, this.editorOptions) : number
 >                                                                          : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >childIndentText : any
 >                : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3643,11 +3643,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(origIndentText, this.editorOptions) : number
 >                                                                         : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3696,7 +3696,7 @@ module Formatting {
 
         private FillInheritedIndentation(tree: ParseTree): void
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^^^^^^^^^^^^^^^    
+>                         : ^    ^^         ^^^^^    
 >tree : ParseTree
 >     : ^^^^^^^^^
         {
@@ -4642,7 +4642,7 @@ module Formatting {
 
         private RegisterIndentation(indent: TextEditInfo, sameLineIndent: boolean): void
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >indent : TextEditInfo
 >       : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -4772,11 +4772,11 @@ module Formatting {
 >this.RegisterIndentation(new TextEditInfo(position, 0, indent), false) : void
 >                                                                       : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                         : ^      ^^            ^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >new TextEditInfo(position, 0, indent) : any
 >                                      : ^^^
 >TextEditInfo : any
@@ -4793,7 +4793,7 @@ module Formatting {
 
         private AdjustStartOffsetIfNeeded(token: TokenSpan, node: ParseNode): void
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                          : ^     ^^         ^^    ^^         ^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -4982,7 +4982,7 @@ module Formatting {
 
         private IsMultiLineString(token: TokenSpan): boolean {
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^^^^^^^^^^^^^^^       
+>                  : ^     ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index 6e2f15b99bac9..b7365ddb1c871 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -1542,7 +1542,7 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                            : ^^^^^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1552,13 +1552,13 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                            : ^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1568,7 +1568,7 @@ export declare module "use_glo_M1_public" {
 
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1646,7 +1646,7 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_public : new () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1656,13 +1656,13 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_public : () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
     var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_private : new () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1672,7 +1672,7 @@ declare module "use_glo_M3_private" {
 
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_private : () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
index ff9599ec47844..7bc83bc1f9987 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
@@ -6,7 +6,7 @@ declare namespace lf {
   export interface Transaction {
     attach(query: query.Builder): Promise<Array<Object>>
 >attach : (query: query.Builder) => Promise<Array<Object>>
->       : ^     ^^^^^^^^^^^^^^^^^^^^                      
+>       : ^     ^^             ^^^^^                      
 >query : query.Builder
 >      : ^^^^^^^^^^^^^
 >query : any
@@ -38,7 +38,7 @@ declare namespace lf {
 
     stats(): TransactionStats
 >stats : () => TransactionStats
->      : ^^^^^^^^^^^^^^^^^^^^^^
+>      : ^^^^^^                
   }
 }
 === lovefield.js ===
@@ -60,7 +60,7 @@ lf.Transaction = function() {};
  */
 lf.Transaction.prototype.begin = function(scope) {};
 >lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                                                    : ^     ^^                      ^^^^^^^^^^^^^^
+>                                                    : ^     ^^                      ^^^^^         
 >lf.Transaction.prototype.begin : any
 >                               : ^^^
 >lf.Transaction.prototype : any
@@ -76,7 +76,7 @@ lf.Transaction.prototype.begin = function(scope) {};
 >begin : any
 >      : ^^^
 >function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                   : ^     ^^                      ^^^^^^^^^^^^^^
+>                   : ^     ^^                      ^^^^^         
 >scope : lf.schema.Table[]
 >      : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 7cb4b6c38b526..092de33da333b 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -34,7 +34,7 @@ declare module Sample.Thing {
   
   		getDomNode(): Element;
 >getDomNode : () => Element
->           : ^^^^^^^^^^^^^
+>           : ^^^^^^       
 		
 		addWidget(widgetId:string, widget:IWidget);
 >addWidget : (widgetId: string, widget: IWidget) => any
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
index b9724d792d72b..650478677ba83 100644
--- a/tests/baselines/reference/recursiveMappedTypes.types
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -35,8 +35,8 @@ type tup = [number, number, number, number];
 >    : ^^^
 
 function foo(arg: Circular<tup>): tup {
->foo : (arg: any) => tup
->    : ^   ^^^^^^^^^^   
+>foo : (arg: Circular<tup>) => tup
+>    : ^   ^^             ^^^^^   
 >arg : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types
index 86b2b2a76f206..9f8d4d2de2a60 100644
--- a/tests/baselines/reference/recursiveTypeComparison2.types
+++ b/tests/baselines/reference/recursiveTypeComparison2.types
@@ -54,7 +54,7 @@ declare module Bacon {
 >initState : U
 >          : ^
 >f : (state: U, event: Event<T>) => StateValue<U, V>
->  : ^     ^^ ^^     ^^        ^^^^^^^^^^^^^^^^^^^^^
+>  : ^     ^^ ^^     ^^        ^^^^^                
 >state : U
 >      : ^
 >event : Event<T>
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index ea8075748f21c..14fc3c854d501 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -117,7 +117,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
 >       : ^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^ ^^          ^^^             ^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: ClassNameObject, key: keyof S) => ClassNameObject
->                                                                                                                                                                                  : ^   ^^^^^^^^^^^^^^^^^^^   ^^       ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                  : ^   ^^               ^^   ^^       ^^^^^^^^^^^^^^^^^^^^
 >obj : ClassNameObject
 >    : ^^^^^^^^^^^^^^^
 >key : keyof S
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index f56cf51e130ee..6610909f4dfd1 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -39,56 +39,56 @@ class Three<T, U, V>{
 }
 
 function A1(): One { return null; }
->A1 : () => any
->   : ^^^^^^^^^
+>A1 : () => One
+>   : ^^^^^^   
 
 function A2(): Two { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two
+>   : ^^^^^^   
 
 function A3(): Three { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three
+>   : ^^^^^^     
 
 function B1(): Two<number> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<number>
+>   : ^^^^^^           
 
 function B2(): Three<string> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<string>
+>   : ^^^^^^             
 
 function B3(): Three<string, number> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, number>
+>   : ^^^^^^                     
 
 class C {
 >C : C
 >  : ^
 
     A1(): One { return null; }
->A1 : () => any
->   : ^^^^^^^^^
+>A1 : () => One
+>   : ^^^^^^   
 
     A2(): Two { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two
+>   : ^^^^^^   
 
     A3(): Three { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three
+>   : ^^^^^^     
 
     B1(): Two<number> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<number>
+>   : ^^^^^^           
 
     B2(): Three<string> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<string>
+>   : ^^^^^^             
 
     B3(): Three<string, number> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, number>
+>   : ^^^^^^                     
 }
 
 class D<T> {
@@ -96,24 +96,24 @@ class D<T> {
 >  : ^^^^
 
     A2(): Two<T> { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two<T>
+>   : ^^^^^^      
 
     A3(): Three<T> { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three<T>
+>   : ^^^^^^        
 
     B1(): Two<T> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<T>
+>   : ^^^^^^      
 
     B2(): Three<T> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<T>
+>   : ^^^^^^        
 
     B3(): Three<string, T> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, T>
+>   : ^^^^^^                
 }
 
 interface I<T> {
@@ -136,8 +136,8 @@ class X<T>
 >  : ^^^^
 {
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -158,8 +158,8 @@ class X<T>
 >   : ^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
@@ -181,12 +181,12 @@ class X<T>
 }
 
 declare var a: {
->a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: any; }
->  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^
+>a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: X; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: Y; }
+>  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^
 
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -207,8 +207,8 @@ declare var a: {
 >   : ^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index d4b647d19d444..18833168898e4 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -45,7 +45,7 @@ module Foo.Bar {
 
     function foo(greeting: string): Foo.Bar.Greeter {
 >foo : (greeting: string) => Foo.Bar.Greeter
->    : ^        ^^      ^^^^^^^^^^^^^^^^^^^^
+>    : ^        ^^      ^^^^^               
 >greeting : string
 >         : ^^^^^^
 >Foo : any
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index 157f53f468e87..b61028cde79de 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -8,23 +8,23 @@ import WinJS = require('staticInstanceResolution5_0');
 // these 3 should be errors
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^^^^^^^^^^^^^^^
+>                   : ^  ^^     ^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
 var y = function (w2: WinJS) { }
 >y : (w2: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >function (w2: WinJS) { } : (w2: WinJS) => void
->                         : ^  ^^^^^^^^^^^^^^^^
+>                         : ^  ^^     ^^^^^^^^^
 >w2 : WinJS
 >   : ^^^^^
 
 function z(w3: WinJS) { }
 >z : (w3: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >w3 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
index 2c0cdd3fb0024..296bd6f3ed763 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
@@ -12,7 +12,7 @@ class C<T> {
 
     static f(x: T) {}
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
@@ -27,7 +27,7 @@ class C2<T, U> {
 
     static f(x: U) { }
 >f : (x: U) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : U
 >  : ^
 }
@@ -42,7 +42,7 @@ class C3<T extends Date> {
 
     static f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
index 5de409da74475..4faf575220e70 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
@@ -7,7 +7,7 @@ class C<T> {
 
     static s(p: T) { return p; }
 >s : (p: T) => T
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^^
 >p : T
 >  : ^
 >p : T
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index 9af014859e0cb..abffd78a7f044 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -101,7 +101,7 @@ function foo() {
 
     function foo(x: private.x) { }
 >foo : (x: private.x) => void
->    : ^ ^^^^^^^^^^^^^^^^^^^^
+>    : ^ ^^         ^^^^^^^^^
 >x : private.x
 >  : ^^^^^^^^^
 >private : any
@@ -109,7 +109,7 @@ function foo() {
 
     function foo1(x: private.package.x) { }
 >foo1 : (x: private.package.x) => void
->     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^ ^^                 ^^^^^^^^^
 >x : private.package.x
 >  : ^^^^^^^^^^^^^^^^^
 >private : any
@@ -119,7 +119,7 @@ function foo() {
 
     function foo2(x: private.package.protected) { }
 >foo2 : (x: private.package.protected) => void
->     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^ ^^                         ^^^^^^^^^
 >x : private.package.protected
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >private : any
diff --git a/tests/baselines/reference/thisTypeErrors.types b/tests/baselines/reference/thisTypeErrors.types
index a336a9aa6e191..47ecf4c09ddd2 100644
--- a/tests/baselines/reference/thisTypeErrors.types
+++ b/tests/baselines/reference/thisTypeErrors.types
@@ -6,8 +6,8 @@ var x1: this;
 >   : ^^^
 
 var x2: { a: this };
->x2 : { a: any; }
->   : ^^^^^^^^^^^
+>x2 : { a: this; }
+>   : ^^^^^    ^^^
 >a : any
 >  : ^^^
 
@@ -16,8 +16,8 @@ var x3: this[];
 >   : ^^^^^
 
 function f1(x: this): this {
->f1 : (x: any) => any
->   : ^ ^^^^^^^^^^^^^
+>f1 : (x: this) => this
+>   : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -32,18 +32,18 @@ function f1(x: this): this {
 
 interface I1 {
     a: { x: this };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: this; }
+>  : ^^^^^    ^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => any
->  : ^^^^^^^^^
+>b : () => this
+>  : ^^^^^^    
 
     c: { new (): this };
->c : new () => any
->  : ^^^^^^^^^^^^^
+>c : new () => this
+>  : ^^^^^^^^^^    
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -52,10 +52,10 @@ interface I1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: any): any; }
->  : ^^^^ ^^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>e : { f(x: this): this; }
+>  : ^^^^ ^^    ^^^    ^^^
+>f : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 }
@@ -65,18 +65,18 @@ class C1 {
 >   : ^^
 
     a: { x: this };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: this; }
+>  : ^^^^^    ^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => any
->  : ^^^^^^^^^
+>b : () => this
+>  : ^^^^^^    
 
     c: { new (): this };
->c : new () => any
->  : ^^^^^^^^^^^^^
+>c : new () => this
+>  : ^^^^^^^^^^    
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -85,10 +85,10 @@ class C1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: any): any; }
->  : ^^^^ ^^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>e : { f(x: this): this; }
+>  : ^^^^ ^^    ^^^    ^^^
+>f : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 }
@@ -110,8 +110,8 @@ class C2 {
 >          : ^^^^^^^^^
 
     static foo(x: this): this {
->foo : (x: any) => any
->    : ^ ^^^^^^^^^^^^^
+>foo : (x: this) => this
+>    : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -141,14 +141,14 @@ class C3 {
 >   : ^^
 
     x1 = {
->x1 : { g(x: any): any; }
->   : ^^^^ ^^^^^^^^^^^^^^
->{        g(x: this): this {            return undefined;        }    } : { g(x: any): any; }
->                                                                       : ^^^^ ^^^^^^^^^^^^^^
+>x1 : { g(x: this): this; }
+>   : ^^^^ ^^    ^^^    ^^^
+>{        g(x: this): this {            return undefined;        }    } : { g(x: this): this; }
+>                                                                       : ^^^^ ^^    ^^^    ^^^
 
         g(x: this): this {
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -162,8 +162,8 @@ class C3 {
 >  : ^^^^^^^^^^
 
         function g(x: this): this {
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -172,14 +172,14 @@ class C3 {
 >          : ^^^^^^^^^
         }
         let x2 = {
->x2 : { h(x: any): any; }
->   : ^^^^ ^^^^^^^^^^^^^^
->{            h(x: this): this {                return undefined;            }        } : { h(x: any): any; }
->                                                                                       : ^^^^ ^^^^^^^^^^^^^^
+>x2 : { h(x: this): this; }
+>   : ^^^^ ^^    ^^^    ^^^
+>{            h(x: this): this {                return undefined;            }        } : { h(x: this): this; }
+>                                                                                       : ^^^^ ^^    ^^^    ^^^
 
             h(x: this): this {
->h : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>h : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index b493759532198..7fda3c139ac01 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -58,7 +58,7 @@ function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 
 function hasMissingIsKeyword(): x {
 >hasMissingIsKeyword : () => x
->                    : ^^^^^^^
+>                    : ^^^^^^ 
 
     return true;
 >true : true
@@ -330,7 +330,7 @@ var b1: b is A;
 
 function b2(a: b is A) {};
 >b2 : (a: b, is: any, A: any) => void
->   : ^ ^^^^^  ^^^^^^^ ^^^^^^^^^^^^^^
+>   : ^ ^^ ^^  ^^^^^^^ ^^^^^^^^^^^^^^
 >a : b
 >  : ^
 >is : any
@@ -339,8 +339,8 @@ function b2(a: b is A) {};
 >  : ^^^
 
 function b3(): A | b is A {
->b3 : () => any
->   : ^^^^^^^^^
+>b3 : () => A | b
+>   : ^^^^^^     
 >is : any
 >   : ^^^
 >A : typeof A
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
index 4b6de36790962..47f7c866ed0ee 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
@@ -50,7 +50,7 @@ interface I<T, U extends T, V extends U> {
 
 function foo<T, U extends T>(x: T, y: U): V { // error
 >foo : <T, U extends T>(x: T, y: U) => V
->    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^
+>    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 >y : U
@@ -58,7 +58,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
     function bar<V extends T, W extends U>(): X { // error
 >bar : <V extends T, W extends U>() => X
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -85,7 +85,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
 function foo2<U extends T, T>(x: T, y: U): W { // error
 >foo2 : <U extends T, T>(x: T, y: U) => W
->     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^
+>     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 >y : U
@@ -93,7 +93,7 @@ function foo2<U extends T, T>(x: T, y: U): W { // error
 
     function bar<V extends T, W extends U>(): Y { // error
 >bar : <V extends T, W extends U>() => Y
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -130,7 +130,7 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
     function bar<V extends T, W extends U>(r: X, s: Y) { // error
 >bar : <V extends T, W extends U>(r: X, s: Y) => void
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 >r : X
 >  : ^
 >s : Y
@@ -163,9 +163,9 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
 var f4 = <U extends T, T>(x: V, y: X) => { // error
 >f4 : <U extends T, T>(x: V, y: X) => void
->   : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>   : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 ><U extends T, T>(x: V, y: X) => { // error    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: V, y: X) => void
->                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 >x : V
 >  : ^
 >y : X
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.types b/tests/baselines/reference/typeParametersInStaticAccessors.types
index 24e855a13a0c1..77f3193522c9b 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.types
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.types
@@ -7,13 +7,13 @@ class foo<T> {
 
     static get Foo(): () => T { return null; }
 >Foo : () => T
->    : ^^^^^^^
+>    : ^^^^^^ 
 
     static set Bar(v: { v: T }) { }
 >Bar : { v: T; }
->    : ^^^^^^^^^
+>    : ^^^^^ ^^^
 >v : { v: T; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 >v : T
 >  : ^
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.types b/tests/baselines/reference/typeParametersInStaticMethods.types
index 9319245303c8a..dcba9fc2668a2 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.types
+++ b/tests/baselines/reference/typeParametersInStaticMethods.types
@@ -9,11 +9,11 @@ class foo<T> {
 >M : (x: (x: T) => { x: { y: T; }; }) => void
 >  : ^ ^^                           ^^^^^^^^^
 >x : (x: T) => { x: { y: T; }; }
->  : ^ ^^^^^^^^                 
+>  : ^ ^^ ^^^^^                 
 >x : T
 >  : ^
 >x : { y: T; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 >y : T
 >  : ^
     }
diff --git a/tests/baselines/reference/typedefTagTypeResolution.types b/tests/baselines/reference/typedefTagTypeResolution.types
index 9712bc5ef0ff8..c193bf7fa420b 100644
--- a/tests/baselines/reference/typedefTagTypeResolution.types
+++ b/tests/baselines/reference/typedefTagTypeResolution.types
@@ -9,8 +9,8 @@
  * @return {T}
  */
 function f(x) {
->f : <U>(x: U) => U
->  : ^ ^^ ^^ ^^^^^^
+>f : <U>(x: U) => T
+>  : ^ ^^ ^^ ^^^^^ 
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/typeofInObjectLiteralType.types b/tests/baselines/reference/typeofInObjectLiteralType.types
index 5aa62c161c84c..0e5ca99fcb430 100644
--- a/tests/baselines/reference/typeofInObjectLiteralType.types
+++ b/tests/baselines/reference/typeofInObjectLiteralType.types
@@ -2,8 +2,8 @@
 
 === typeofInObjectLiteralType.ts ===
 var a: { b: number; c: typeof b }; // Should give error for attempting to use type query on b.
->a : { b: number; c: any; }
->  : ^^^^^      ^^^^^^^^^^^
+>a : { b: number; c: typeof b; }
+>  : ^^^^^      ^^^^^        ^^^
 >b : number
 >  : ^^^^^^
 >c : any
diff --git a/tests/baselines/reference/undeclaredModuleError.types b/tests/baselines/reference/undeclaredModuleError.types
index ce795bd32a875..da0d54d795717 100644
--- a/tests/baselines/reference/undeclaredModuleError.types
+++ b/tests/baselines/reference/undeclaredModuleError.types
@@ -11,7 +11,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >path : string
 >     : ^^^^^^
 >accept : (stat: fs.Stats, name: string) => boolean
->       : ^    ^^^^^^^^^^^^    ^^      ^^^^^       
+>       : ^    ^^        ^^    ^^      ^^^^^       
 >stat : fs.Stats
 >     : ^^^^^^^^
 >fs : any
@@ -23,7 +23,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >error : Error
 >      : ^^^^^
 >results : { name: string; stat: fs.Stats; }[]
->        : ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^      ^^^^^^^^        ^^^^^
 >name : string
 >     : ^^^^^^
 >stat : fs.Stats
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index ffa16ff343598..d1c1862c98357 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -19,7 +19,7 @@ interface Query<T> {
 >item : T
 >     : ^
 >resultSelector : (outer: T, inner: U) => R
->               : ^     ^^ ^^     ^^ ^^^^^^
+>               : ^     ^^ ^^     ^^ ^^^^^ 
 >outer : T
 >      : ^
 >inner : U
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.types b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
index a35d347932961..8ade76d37e201 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.types
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
@@ -11,7 +11,7 @@ class Linq {
 >values : T[]
 >       : ^^^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^^
+>     : ^ ^^ ^^^^^ 
 >v : T
 >  : ^
 
@@ -61,7 +61,7 @@ class Linq {
 >func(values[i]) : A
 >                : ^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^^
+>     : ^ ^^ ^^^^^ 
 >values[i] : T
 >          : ^
 >values : T[]
diff --git a/tests/baselines/reference/unknownSymbols1.types b/tests/baselines/reference/unknownSymbols1.types
index d762a0d699509..4d2c58ee5ad39 100644
--- a/tests/baselines/reference/unknownSymbols1.types
+++ b/tests/baselines/reference/unknownSymbols1.types
@@ -13,7 +13,7 @@ var y: asdf;
 
 function foo(x: asdf, y: number): asdf { }
 >foo : (x: asdf, y: number) => asdf
->    : ^ ^^^^^^^^ ^^      ^^^^^^^^^
+>    : ^ ^^    ^^ ^^      ^^^^^    
 >x : asdf
 >  : ^^^^
 >y : number
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
index 1edc387f4bf10..764075a757be3 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
@@ -18,7 +18,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: any);`,
+      insertText: `method(param: import("./doesntexist.js").Foo);`,
       filterText: "method",
       hasAction: undefined,
     },
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
index 61396a635886b..072725ac2f745 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
@@ -21,7 +21,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: any);`,
+      insertText: `method(param: import("./doesntexist.js").Foo);`,
       filterText: "method",
       hasAction: undefined,
     },

From 31853812a0b220878f472dbff5e8d6157a7b0b0a Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Fri, 2 Aug 2024 19:45:25 -0700
Subject: [PATCH 07/11] Added flag internalNodeBuilderFlags

---
 src/compiler/checker.ts                       | 144 +--
 src/compiler/transformers/declarations.ts     |  16 +-
 src/compiler/types.ts                         |  33 +-
 .../codefixes/fixAddMissingConstraint.ts      |   2 +-
 src/services/codefixes/fixAddMissingMember.ts |   3 +-
 .../fixClassIncorrectlyImplementsInterface.ts |   2 +-
 .../fixMissingTypeAnnotationOnExports.ts      |  10 +-
 src/services/codefixes/helpers.ts             |  26 +-
 src/services/completions.ts                   |   2 +-
 src/services/utilities.ts                     |   2 +-
 .../baselines/reference/ArrowFunction1.types  |   4 +-
 ...duleMemberThatUsesClassTypeParameter.types |   2 +-
 tests/baselines/reference/arguments.types     |  12 +-
 .../arrayReferenceWithoutTypeArgs.types       |   4 +-
 .../asyncAwaitIsolatedModules_es2017.types    |  24 +-
 .../asyncAwaitIsolatedModules_es5.types       |  24 +-
 .../asyncAwaitIsolatedModules_es6.types       |  24 +-
 .../badExternalModuleReference.types          |   2 +-
 .../reference/bluebirdStaticThis.types        |   2 +-
 .../reference/circularBaseTypes.types         |   4 +-
 .../reference/complicatedPrivacy.types        |   4 +-
 ...structorWithIncompleteTypeAnnotation.types |   8 +-
 ...arationEmitComputedPropertyNameEnum2.types |   8 +-
 .../declarationEmitOutFileBundlePaths.js      |  25 +-
 .../errorsInGenericTypeReference.types        |  22 +-
 ...orMetadataUnresolvedTypeObjectInEmit.types |   2 +-
 .../baselines/reference/exportNamespace_js.js |   2 +-
 ...rtSpecifierAndLocalMemberDeclaration.types |   2 +-
 ...pecifierReferencingOuterDeclaration3.types |   2 +-
 ...pecifierReferencingOuterDeclaration4.types |   2 +-
 tests/baselines/reference/extendArray.types   |   2 +-
 .../functionTypesLackingReturnTypes.types     |   2 +-
 ...nctionVariableInReturnTypeAnnotation.types |   4 +-
 ...icCallWithGenericSignatureArguments2.types |   2 +-
 ...icClassWithStaticsUsingTypeArguments.types |  12 +-
 .../genericLambaArgWithoutTypeArguments.types |   4 +-
 ...cRecursiveImplicitConstructorErrors3.types |  28 +-
 ...icTypeReferenceWithoutTypeArgument.d.types |  12 +-
 ...ericTypeReferenceWithoutTypeArgument.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument2.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument3.types |  12 +-
 .../genericsWithoutTypeParameters1.types      |  16 +-
 .../reference/importTypeGeneric.types         |   8 +-
 .../reference/importedModuleAddToGlobal.types |   2 +-
 .../reference/intrinsicKeyword.types          |   2 +-
 .../jsDeclarationEmitDoesNotRenameImport.js   |  47 +-
 .../jsDeclarationsClassExtendsVisibility.js   |  30 +-
 .../jsDeclarationsCommonjsRelativePath.js     |   2 +-
 .../jsDeclarationsCrossfileMerge.errors.txt   |  17 -
 .../reference/jsDeclarationsCrossfileMerge.js |  32 +-
 .../jsDeclarationsCrossfileMerge.types        |   1 -
 ...AssignedClassExpressionAnonymousWithSub.js |  28 +-
 ...ignedConstructorFunctionWithSub.errors.txt |  20 -
 ...xportAssignedConstructorFunctionWithSub.js |  30 +
 ...rtAssignedConstructorFunctionWithSub.types |   2 -
 .../jsDeclarationsExportAssignedVisibility.js |  25 +-
 .../reference/jsDeclarationsExportForms.js    |  91 +-
 .../reference/jsDeclarationsExportFormsErr.js |   4 +-
 .../jsDeclarationsExportedClassAliases.js     |  21 +-
 .../reference/jsDeclarationsFunctions.js      |  72 +-
 ...onsImportAliasExposedWithinNamespaceCjs.js |   2 +-
 .../jsDeclarationsReexportedCjsAlias.js       |  31 +-
 ...ationsReferenceToClassInstanceCrossFile.js |   2 +-
 ...ypeReassignmentFromDeclaration2.errors.txt |  14 -
 ...rationsTypeReassignmentFromDeclaration2.js |  25 +
 ...ionsTypeReassignmentFromDeclaration2.types |   1 -
 ...arationsWithDefaultAsNamespaceLikeMerge.js |   2 +-
 .../jsdocFunctionTypeFalsePositive.types      |   2 +-
 .../reference/jsdocOuterTypeParameters1.types |   6 +-
 .../jsdocParameterParsingInfiniteLoop.types   |   2 +-
 .../jsdocResolveNameFailureInTypedef.types    |   4 +-
 .../baselines/reference/lambdaArgCrash.types  |   4 +-
 tests/baselines/reference/localTypes4.types   |   2 +-
 .../reference/missingTypeArguments1.types     |   8 +-
 .../reference/missingTypeArguments2.types     |  12 +-
 ...moduleAugmentationImportsAndExports2.types |   2 +-
 ...moduleAugmentationImportsAndExports3.types |   2 +-
 .../reference/moduleExportAssignment7.types   |  12 +-
 .../reference/moduleInTypePosition1.types     |   4 +-
 tests/baselines/reference/modulePreserve4.js  |   2 +-
 ...ropertyAccessAndArrowFunctionIndent1.types |   4 +-
 .../noTypeArgumentOnReturnType1.types         |   4 +-
 ...jectTypesIdentityWithCallSignatures3.types |  12 +-
 tests/baselines/reference/parser553699.types  |   2 +-
 .../parserArrowFunctionExpression10.types     |   8 +-
 .../parserArrowFunctionExpression17.types     |   4 +-
 ...rrantEqualsGreaterThanAfterFunction2.types |   2 +-
 .../parserErrorRecovery_ParameterList6.types  |   2 +-
 .../parserGenericsInTypeContexts1.types       |   4 +-
 .../parserGenericsInTypeContexts2.types       |   4 +-
 .../parserMissingLambdaOpenBrace1.types       |   2 +-
 .../reference/parserObjectType5.types         |   2 +-
 .../reference/parserObjectType6.types         |   2 +-
 .../reference/parserRealSource10.types        | 220 ++--
 .../reference/parserRealSource11.types        | 240 ++---
 .../reference/parserRealSource12.types        | 978 +++++++++---------
 .../reference/parserRealSource13.types        | 242 ++---
 .../reference/parserRealSource14.types        |  66 +-
 .../reference/parserRealSource5.types         |   4 +-
 .../reference/parserRealSource6.types         |  66 +-
 .../reference/parserRealSource7.types         |  70 +-
 .../reference/parserRealSource8.types         |  42 +-
 .../reference/parserRealSource9.types         |  72 +-
 .../parserUnterminatedGeneric1.types          |   2 +-
 .../parserUnterminatedGeneric2.types          |   2 +-
 .../reference/parserX_ArrowFunction1.types    |   4 +-
 tests/baselines/reference/parserharness.types | 180 ++--
 .../baselines/reference/parserindenter.types  | 138 +--
 .../reference/privacyImportParseErrors.types  |  16 +-
 ...tyAssignmentMergeWithInterfaceMethod.types |   8 +-
 .../recursiveClassReferenceTest.types         |   2 +-
 .../reference/recursiveMappedTypes.types      |   4 +-
 .../reference/recursiveTypeComparison2.types  |   2 +-
 .../reference/recursiveTypeRelations.types    |   2 +-
 .../reference/returnTypeTypeArguments.types   |  88 +-
 ...ationImportTypeInGlobalThisTypeArgument.js |   2 +-
 .../baselines/reference/sourceMapSample.types |   2 +-
 .../reference/staticInstanceResolution5.types |  10 +-
 ...staticMembersUsingClassTypeParameter.types |   6 +-
 ...ethodsReferencingClassTypeParameters.types |   2 +-
 .../reference/strictModeReservedWord.types    |   6 +-
 .../baselines/reference/thisTypeErrors.types  |  80 +-
 .../reference/typeGuardFunctionErrors.types   |   8 +-
 ...ameterUsedAsTypeParameterConstraint4.types |  14 +-
 .../typeParametersInStaticAccessors.types     |   6 +-
 .../typeParametersInStaticMethods.types       |   4 +-
 .../reference/typedefTagTypeResolution.types  |   4 +-
 .../reference/typeofInObjectLiteralType.types |   4 +-
 .../reference/undeclaredModuleError.types     |   4 +-
 .../reference/undefinedTypeArgument2.types    |   2 +-
 .../unknownSymbolInGenericReturnType.types    |   4 +-
 .../baselines/reference/unknownSymbols1.types |   2 +-
 ...ionsClassMemberImportTypeNodeParameter2.ts |   2 +-
 ...ionsClassMemberImportTypeNodeParameter4.ts |   2 +-
 134 files changed, 2100 insertions(+), 1714 deletions(-)
 delete mode 100644 tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
 delete mode 100644 tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
 delete mode 100644 tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f18a0b2a32a23..4d97009dc6aa3 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -447,6 +447,7 @@ import {
     InterfaceDeclaration,
     InterfaceType,
     InterfaceTypeWithDeclaredMembers,
+    InternalNodeBuilderFlags,
     InternalSymbolName,
     IntersectionFlags,
     IntersectionType,
@@ -5911,6 +5912,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags: SymbolFormatFlags = SymbolFormatFlags.AllowAnyNodeKind, writer?: EmitTextWriter): string {
         let nodeFlags = NodeBuilderFlags.IgnoreErrors;
+        let internalNodeFlags = InternalNodeBuilderFlags.None;
         if (flags & SymbolFormatFlags.UseOnlyExternalAliasing) {
             nodeFlags |= NodeBuilderFlags.UseOnlyExternalAliasing;
         }
@@ -5921,16 +5923,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             nodeFlags |= NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
         }
         if (flags & SymbolFormatFlags.DoNotIncludeSymbolChain) {
-            nodeFlags |= NodeBuilderFlags.DoNotIncludeSymbolChain;
+            internalNodeFlags |= InternalNodeBuilderFlags.DoNotIncludeSymbolChain;
         }
         if (flags & SymbolFormatFlags.WriteComputedProps) {
-            nodeFlags |= NodeBuilderFlags.WriteComputedProps;
+            internalNodeFlags |= InternalNodeBuilderFlags.WriteComputedProps;
         }
         const builder = flags & SymbolFormatFlags.AllowAnyNodeKind ? nodeBuilder.symbolToNode : nodeBuilder.symbolToEntityName;
         return writer ? symbolToStringWorker(writer).getText() : usingSingleLineStringWriter(symbolToStringWorker);
 
         function symbolToStringWorker(writer: EmitTextWriter) {
-            const entity = builder(symbol, meaning!, enclosingDeclaration, nodeFlags)!; // TODO: GH#18217
+            const entity = builder(symbol, meaning!, enclosingDeclaration, nodeFlags, internalNodeFlags)!; // TODO: GH#18217
             // add neverAsciiEscape for GH#39027
             const printer = enclosingDeclaration?.kind === SyntaxKind.SourceFile
                 ? createPrinterWithRemoveCommentsNeverAsciiEscape()
@@ -5962,7 +5964,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
         const noTruncation = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation;
-        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : 0));
+        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None));
         if (typeNode === undefined) return Debug.fail("should always get typenode");
         // The unresolved type gets a synthesized comment on `any` to hint to users that it's not a plain `any`.
         // Otherwise, we always strip comments out.
@@ -6013,20 +6015,20 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
     function createNodeBuilder() {
         return {
-            typeToTypeNode: (type: Type, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => typeToTypeNodeHelper(type, context)),
-            typePredicateToTypePredicateNode: (typePredicate: TypePredicate, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => typePredicateToTypePredicateNodeHelper(typePredicate, context)),
-            expressionOrTypeToTypeNode: (expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => expressionOrTypeToTypeNode(context, expr, type, addUndefined)),
-            serializeTypeForDeclaration: (declaration: Declaration, type: Type, symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => serializeTypeForDeclaration(context, declaration, type, symbol)),
-            serializeReturnTypeForSignature: (signature: Signature, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => serializeReturnTypeForSignature(context, signature)),
-            indexInfoToIndexSignatureDeclaration: (indexInfo: IndexInfo, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => indexInfoToIndexSignatureDeclarationHelper(indexInfo, context, /*typeNode*/ undefined)),
-            signatureToSignatureDeclaration: (signature: Signature, kind: SignatureDeclaration["kind"], enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => signatureToSignatureDeclarationHelper(signature, kind, context)),
-            symbolToEntityName: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => symbolToName(symbol, context, meaning, /*expectsIdentifier*/ false)),
-            symbolToExpression: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => symbolToExpression(symbol, context, meaning)),
-            symbolToTypeParameterDeclarations: (symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => typeParametersToTypeParameterDeclarations(symbol, context)),
-            symbolToParameterDeclaration: (symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => symbolToParameterDeclaration(symbol, context)),
-            typeParameterToDeclaration: (parameter: TypeParameter, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => typeParameterToDeclaration(parameter, context)),
-            symbolTableToDeclarationStatements: (symbolTable: SymbolTable, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => symbolTableToDeclarationStatements(symbolTable, context)),
-            symbolToNode: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, tracker, context => symbolToNode(symbol, context, meaning)),
+            typeToTypeNode: (type: Type, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => typeToTypeNodeHelper(type, context)),
+            typePredicateToTypePredicateNode: (typePredicate: TypePredicate, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => typePredicateToTypePredicateNodeHelper(typePredicate, context)),
+            expressionOrTypeToTypeNode: (expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => expressionOrTypeToTypeNode(context, expr, type, addUndefined)),
+            serializeTypeForDeclaration: (declaration: Declaration, type: Type, symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => serializeTypeForDeclaration(context, declaration, type, symbol)),
+            serializeReturnTypeForSignature: (signature: Signature, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => serializeReturnTypeForSignature(context, signature)),
+            indexInfoToIndexSignatureDeclaration: (indexInfo: IndexInfo, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => indexInfoToIndexSignatureDeclarationHelper(indexInfo, context, /*typeNode*/ undefined)),
+            signatureToSignatureDeclaration: (signature: Signature, kind: SignatureDeclaration["kind"], enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => signatureToSignatureDeclarationHelper(signature, kind, context)),
+            symbolToEntityName: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => symbolToName(symbol, context, meaning, /*expectsIdentifier*/ false)),
+            symbolToExpression: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => symbolToExpression(symbol, context, meaning)),
+            symbolToTypeParameterDeclarations: (symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => typeParametersToTypeParameterDeclarations(symbol, context)),
+            symbolToParameterDeclaration: (symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => symbolToParameterDeclaration(symbol, context)),
+            typeParameterToDeclaration: (parameter: TypeParameter, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => typeParameterToDeclaration(parameter, context)),
+            symbolTableToDeclarationStatements: (symbolTable: SymbolTable, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => symbolTableToDeclarationStatements(symbolTable, context)),
+            symbolToNode: (symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) => withContext(enclosingDeclaration, flags, internalFlags, tracker, context => symbolToNode(symbol, context, meaning)),
         };
 
         function getTypeFromTypeNode(context: NodeBuilderContext, node: TypeNode, noMappedTypes?: false): Type;
@@ -6066,13 +6068,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
          * Same as expressionOrTypeToTypeNodeHelper, but also checks if the expression can be syntactically typed.
          */
         function expressionOrTypeToTypeNode(context: NodeBuilderContext, expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean) {
-            const oldFlags = context.flags;
-            if (expr && !(context.flags & NodeBuilderFlags.NoSyntacticPrinter)) {
+            const oldFlags = saveFlags(context);
+            if (expr && !(context.internalFlags & InternalNodeBuilderFlags.NoSyntacticPrinter)) {
                 syntacticNodeBuilder.serializeTypeOfExpression(expr, context, addUndefined);
             }
-            context.flags |= NodeBuilderFlags.NoSyntacticPrinter;
+            context.internalFlags |= InternalNodeBuilderFlags.NoSyntacticPrinter;
             const result = expressionOrTypeToTypeNodeHelper(context, expr, type, addUndefined);
-            context.flags = oldFlags;
+            oldFlags.restore();
             return result;
         }
         function expressionOrTypeToTypeNodeHelper(context: NodeBuilderContext, expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean) {
@@ -6140,7 +6142,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         function symbolToNode(symbol: Symbol, context: NodeBuilderContext, meaning: SymbolFlags) {
-            if (context.flags & NodeBuilderFlags.WriteComputedProps) {
+            if (context.internalFlags & InternalNodeBuilderFlags.WriteComputedProps) {
                 if (symbol.valueDeclaration) {
                     const name = getNameOfDeclaration(symbol.valueDeclaration);
                     if (name && isComputedPropertyName(name)) return name;
@@ -6154,14 +6156,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return symbolToExpression(symbol, context, meaning);
         }
 
-        function withContext<T>(enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker: SymbolTracker | undefined, cb: (context: NodeBuilderContext) => T): T | undefined {
+        function withContext<T>(enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags: InternalNodeBuilderFlags | undefined, tracker: SymbolTracker | undefined, cb: (context: NodeBuilderContext) => T): T | undefined {
             const moduleResolverHost = tracker?.trackSymbol ? tracker.moduleResolverHost :
-                flags! & NodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
+                (internalFlags || InternalNodeBuilderFlags.None) & InternalNodeBuilderFlags.DoNotIncludeSymbolChain ? createBasicNodeBuilderModuleSpecifierResolutionHost(host) :
                 undefined;
             const context: NodeBuilderContext = {
                 enclosingDeclaration,
                 enclosingFile: enclosingDeclaration && getSourceFileOfNode(enclosingDeclaration),
                 flags: flags || NodeBuilderFlags.None,
+                internalFlags: internalFlags || InternalNodeBuilderFlags.None,
                 tracker: undefined!,
                 encounteredError: false,
                 reportedDiagnostic: false,
@@ -6192,15 +6195,27 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return context.encounteredError ? undefined : resultingNode;
         }
 
+        function saveFlags(context: NodeBuilderContext) {
+            const flags = context.flags;
+            const internalFlags = context.internalFlags;
+
+            return { restore };
+
+            function restore() {
+                context.flags = flags;
+                context.internalFlags = internalFlags;
+            }
+        }
+
         function checkTruncationLength(context: NodeBuilderContext): boolean {
             if (context.truncating) return context.truncating;
             return context.truncating = context.approximateLength > ((context.flags & NodeBuilderFlags.NoTruncation) ? noTruncationMaximumTruncationLength : defaultMaximumTruncationLength);
         }
 
         function typeToTypeNodeHelper(type: Type, context: NodeBuilderContext): TypeNode {
-            const savedFlags = context.flags;
+            const savedFlags = saveFlags(context);
             const typeNode = typeToTypeNodeWorker(type, context);
-            context.flags = savedFlags;
+            savedFlags.restore();
             return typeNode;
         }
 
@@ -6677,7 +6692,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
 
                 const links = context.enclosingDeclaration && getNodeLinks(context.enclosingDeclaration);
-                const key = `${getTypeId(type)}|${context.flags}`;
+                const key = `${getTypeId(type)}|${context.flags}|${context.internalFlags}`;
                 if (links) {
                     links.serializedTypes ||= new Map();
                 }
@@ -6798,10 +6813,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     return typeToTypeNodeHelper(getIntersectionType(types), context);
                 }
 
-                const savedFlags = context.flags;
+                const savedFlags = saveFlags(context);
                 context.flags |= NodeBuilderFlags.InObjectTypeLiteral;
                 const members = createTypeNodesFromResolvedType(resolved);
-                context.flags = savedFlags;
+                savedFlags.restore();
                 const typeLiteralNode = factory.createTypeLiteralNode(members);
                 context.approximateLength += 2;
                 setEmitFlags(typeLiteralNode, (context.flags & NodeBuilderFlags.MultilineObjectLiterals) ? 0 : EmitFlags.SingleLine);
@@ -6882,10 +6897,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                             // the default outer type arguments), we don't show the group.
                             if (!rangeEquals(outerTypeParameters, typeArguments, start, i)) {
                                 const typeArgumentSlice = mapToTypeNodes(typeArguments.slice(start, i), context);
-                                const flags = context.flags;
+                                const flags = saveFlags(context);
                                 context.flags |= NodeBuilderFlags.ForbidIndexedAccessSymbolReferences;
                                 const ref = symbolToTypeNode(parent, context, SymbolFlags.Type, typeArgumentSlice) as TypeReferenceNode | ImportTypeNode;
-                                context.flags = flags;
+                                flags.restore();
                                 resultType = !resultType ? ref : appendReferenceToType(resultType, ref as TypeReferenceNode);
                             }
                         }
@@ -6925,10 +6940,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
                         typeArgumentNodes = mapToTypeNodes(typeArguments.slice(i, typeParameterCount), context);
                     }
-                    const flags = context.flags;
+                    const flags = saveFlags(context);
                     context.flags |= NodeBuilderFlags.ForbidIndexedAccessSymbolReferences;
                     const finalRef = symbolToTypeNode(type.symbol, context, SymbolFlags.Type, typeArgumentNodes);
-                    context.flags = flags;
+                    flags.restore();
                     return !resultType ? finalRef : appendReferenceToType(resultType, finalRef as TypeReferenceNode);
                 }
             }
@@ -7255,7 +7270,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     // once while referring to different types. If so, regenerate the
                     // type node for each entry by that name with the
                     // `UseFullyQualifiedType` flag enabled.
-                    const saveContextFlags = context.flags;
+                    const savedContextFlags = saveFlags(context);
                     context.flags |= NodeBuilderFlags.UseFullyQualifiedType;
                     seenNames.forEach(types => {
                         if (!arrayIsHomogeneous(types, ([a], [b]) => typesAreSameReference(a, b))) {
@@ -7264,7 +7279,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                             }
                         }
                     });
-                    context.flags = saveContextFlags;
+                    savedContextFlags.restore();
                 }
 
                 return result;
@@ -7324,7 +7339,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 typeParameters = signature.typeParameters && signature.typeParameters.map(parameter => typeParameterToDeclaration(parameter, context));
             }
 
-            const flags = context.flags;
+            const flags = saveFlags(context);
             context.flags &= ~NodeBuilderFlags.SuppressAnyReturnType; // SuppressAnyReturnType should only apply to the signature `return` position
             // If the expanded parameter list had a variadic in a non-trailing position, don't expand it
             const parameters = (some(expandedParams, p => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & CheckFlags.RestParameter)) ? signature.parameters : expandedParams).map(parameter => symbolToParameterDeclaration(parameter, context, kind === SyntaxKind.Constructor));
@@ -7332,7 +7347,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             if (thisParameter) {
                 parameters.unshift(thisParameter);
             }
-            context.flags = flags;
+            flags.restore();
 
             const returnTypeNode = serializeReturnTypeForSignature(context, signature);
 
@@ -7571,13 +7586,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         function typeParameterToDeclarationWithConstraint(type: TypeParameter, context: NodeBuilderContext, constraintNode: TypeNode | undefined): TypeParameterDeclaration {
-            const savedContextFlags = context.flags;
+            const savedContextFlags = saveFlags(context);
             context.flags &= ~NodeBuilderFlags.WriteTypeParametersInQualifiedName; // Avoids potential infinite loop when building for a claimspace with a generic
             const modifiers = factory.createModifiersFromModifierFlags(getTypeParameterModifiers(type));
             const name = typeParameterToName(type, context);
             const defaultParameter = getDefaultFromTypeParameter(type);
             const defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
-            context.flags = savedContextFlags;
+            savedContextFlags.restore();
             return factory.createTypeParameterDeclaration(modifiers, name, constraintNode, defaultParameterNode);
         }
 
@@ -7686,7 +7701,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             // Try to get qualified name if the symbol is not a type parameter and there is an enclosing declaration.
             let chain: Symbol[];
             const isTypeParameter = symbol.flags & SymbolFlags.TypeParameter;
-            if (!isTypeParameter && (context.enclosingDeclaration || context.flags & NodeBuilderFlags.UseFullyQualifiedType) && !(context.flags & NodeBuilderFlags.DoNotIncludeSymbolChain)) {
+            if (!isTypeParameter && (context.enclosingDeclaration || context.flags & NodeBuilderFlags.UseFullyQualifiedType) && !(context.internalFlags & InternalNodeBuilderFlags.DoNotIncludeSymbolChain)) {
                 chain = Debug.checkDefined(getSymbolChain(symbol, meaning, /*endOfChain*/ true));
                 Debug.assert(chain && chain.length > 0);
             }
@@ -8298,12 +8313,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         function serializeTypeForDeclaration(context: NodeBuilderContext, declaration: Declaration | undefined, type: Type, symbol: Symbol) {
             const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration);
             const enclosingDeclaration = context.enclosingDeclaration;
-            const oldFlags = context.flags;
-            if (declaration && hasInferredType(declaration) && !(context.flags & NodeBuilderFlags.NoSyntacticPrinter)) {
+            const oldFlags = saveFlags(context);
+            if (declaration && hasInferredType(declaration) && !(context.internalFlags & InternalNodeBuilderFlags.NoSyntacticPrinter)) {
                 syntacticNodeBuilder.serializeTypeOfDeclaration(declaration, context);
             }
-            context.flags |= NodeBuilderFlags.NoSyntacticPrinter;
-            if (enclosingDeclaration && (!isErrorType(type) || (context.flags & NodeBuilderFlags.AllowUnresolvedNames))) {
+            context.internalFlags |= InternalNodeBuilderFlags.NoSyntacticPrinter;
+            if (enclosingDeclaration && (!isErrorType(type) || (context.internalFlags & InternalNodeBuilderFlags.AllowUnresolvedNames))) {
                 const declWithExistingAnnotation = declaration && getNonlocalEffectiveTypeAnnotationNode(declaration)
                     ? declaration
                     : getDeclarationWithTypeAnnotation(symbol);
@@ -8314,7 +8329,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     const addUndefined = addUndefinedForParameter || !!(symbol.flags & SymbolFlags.Property && symbol.flags & SymbolFlags.Optional && isOptionalDeclaration(declWithExistingAnnotation) && (symbol as MappedSymbol).links?.mappedType && containsNonMissingUndefinedType(type));
                     const result = !isTypePredicateNode(existing) && tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
                     if (result) {
-                        context.flags = oldFlags;
+                        oldFlags.restore();
                         return result;
                     }
                 }
@@ -8330,7 +8345,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const expr = decl && isDeclarationWithPossibleInnerTypeNodeReuse(decl) ? getPossibleTypeNodeReuseExpression(decl) : undefined;
 
             const result = expressionOrTypeToTypeNode(context, expr, type, addUndefinedForParameter);
-            context.flags = oldFlags;
+            oldFlags.restore();
             return result;
         }
 
@@ -8346,28 +8361,28 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
         function serializeReturnTypeForSignature(context: NodeBuilderContext, signature: Signature) {
             const suppressAny = context.flags & NodeBuilderFlags.SuppressAnyReturnType;
-            const flags = context.flags;
+            const flags = saveFlags(context);
             if (suppressAny) context.flags &= ~NodeBuilderFlags.SuppressAnyReturnType; // suppress only toplevel `any`s
             let returnTypeNode: TypeNode | undefined;
             const returnType = getReturnTypeOfSignature(signature);
             if (returnType && !(suppressAny && isTypeAny(returnType))) {
-                if (signature.declaration && !(context.flags & NodeBuilderFlags.NoSyntacticPrinter)) {
+                if (signature.declaration && !(context.internalFlags & InternalNodeBuilderFlags.NoSyntacticPrinter)) {
                     syntacticNodeBuilder.serializeReturnTypeForSignature(signature.declaration, context);
                 }
-                context.flags |= NodeBuilderFlags.NoSyntacticPrinter;
+                context.internalFlags |= InternalNodeBuilderFlags.NoSyntacticPrinter;
                 returnTypeNode = serializeReturnTypeForSignatureWorker(context, signature);
             }
             else if (!suppressAny) {
                 returnTypeNode = factory.createKeywordTypeNode(SyntaxKind.AnyKeyword);
             }
-            context.flags = flags;
+            flags.restore();
             return returnTypeNode;
         }
 
         function serializeReturnTypeForSignatureWorker(context: NodeBuilderContext, signature: Signature) {
             const typePredicate = getTypePredicateOfSignature(signature);
             const type = getReturnTypeOfSignature(signature);
-            if (context.enclosingDeclaration && (!isErrorType(type) || (context.flags & NodeBuilderFlags.AllowUnresolvedNames)) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
+            if (context.enclosingDeclaration && (!isErrorType(type) || (context.internalFlags & InternalNodeBuilderFlags.AllowUnresolvedNames)) && signature.declaration && !nodeIsSynthesized(signature.declaration)) {
                 const annotation = getNonlocalEffectiveReturnTypeAnnotationNode(signature.declaration);
                 if (annotation) {
                     const result = tryReuseExistingTypeNode(context, annotation, type, context.enclosingDeclaration);
@@ -8883,7 +8898,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     if (!hasDynamicName(node)) {
                         return visitEachChild(node, visitExistingNodeTreeSymbols);
                     }
-                    if (!(context.flags & NodeBuilderFlags.AllowUnresolvedNames && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & TypeFlags.Any)) {
+                    if (!(context.internalFlags & InternalNodeBuilderFlags.AllowUnresolvedNames && isEntityNameExpression(node.name.expression) && checkComputedPropertyName(node.name).flags & TypeFlags.Any)) {
                         return undefined;
                     }
                 }
@@ -9615,7 +9630,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 const typeParamDecls = map(typeParams, p => typeParameterToDeclaration(p, context));
                 const jsdocAliasDecl = symbol.declarations?.find(isJSDocTypeAlias);
                 const commentText = getTextOfJSDocComment(jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : undefined);
-                const oldFlags = context.flags;
+                const oldFlags = saveFlags(context);
                 context.flags |= NodeBuilderFlags.InTypeAlias;
                 const oldEnclosingDecl = context.enclosingDeclaration;
                 context.enclosingDeclaration = jsdocAliasDecl;
@@ -9630,7 +9645,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     ),
                     modifierFlags,
                 );
-                context.flags = oldFlags;
+                oldFlags.restore();
                 context.enclosingDeclaration = oldEnclosingDecl;
             }
 
@@ -10643,10 +10658,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
             function getNameCandidateWorker(symbol: Symbol, localName: string) {
                 if (localName === InternalSymbolName.Default || localName === InternalSymbolName.Class || localName === InternalSymbolName.Function) {
-                    const flags = context.flags;
+                    const flags = saveFlags(context);
                     context.flags |= NodeBuilderFlags.InInitialEntityName;
                     const nameCandidate = getNameOfSymbolAsWritten(symbol, context);
-                    context.flags = flags;
+                    flags.restore();
                     localName = nameCandidate.length > 0 && isSingleOrDoubleQuote(nameCandidate.charCodeAt(0)) ? stripQuotes(nameCandidate) : nameCandidate;
                 }
                 if (localName === InternalSymbolName.Default) {
@@ -49751,7 +49766,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
     }
 
-    function createTypeOfDeclaration(declarationIn: AccessorDeclaration | VariableLikeDeclaration | PropertyAccessExpression, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker) {
+    function createTypeOfDeclaration(declarationIn: AccessorDeclaration | VariableLikeDeclaration | PropertyAccessExpression, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker) {
         const declaration = getParseTreeNode(declarationIn, isVariableLikeOrAccessor);
         if (!declaration) {
             return factory.createToken(SyntaxKind.AnyKeyword) as KeywordTypeNode;
@@ -49762,7 +49777,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             ? getWidenedLiteralType(getTypeOfSymbol(symbol))
             : errorType;
 
-        return nodeBuilder.serializeTypeForDeclaration(declaration, type, symbol, enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, tracker);
+        return nodeBuilder.serializeTypeForDeclaration(declaration, type, symbol, enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, internalFlags, tracker);
     }
 
     type DeclarationWithPotentialInnerNodeReuse =
@@ -49828,21 +49843,21 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return candidateExpr;
     }
 
-    function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn: SignatureDeclaration, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker) {
+    function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn: SignatureDeclaration, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker) {
         const signatureDeclaration = getParseTreeNode(signatureDeclarationIn, isFunctionLike);
         if (!signatureDeclaration) {
             return factory.createToken(SyntaxKind.AnyKeyword) as KeywordTypeNode;
         }
-        return nodeBuilder.serializeReturnTypeForSignature(getSignatureFromDeclaration(signatureDeclaration), enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, tracker);
+        return nodeBuilder.serializeReturnTypeForSignature(getSignatureFromDeclaration(signatureDeclaration), enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, internalFlags, tracker);
     }
 
-    function createTypeOfExpression(exprIn: Expression, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker) {
+    function createTypeOfExpression(exprIn: Expression, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker) {
         const expr = getParseTreeNode(exprIn, isExpression);
         if (!expr) {
             return factory.createToken(SyntaxKind.AnyKeyword) as KeywordTypeNode;
         }
         const type = getWidenedType(getRegularTypeOfExpression(expr));
-        return nodeBuilder.expressionOrTypeToTypeNode(expr, type, /*addUndefined*/ undefined, enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, tracker);
+        return nodeBuilder.expressionOrTypeToTypeNode(expr, type, /*addUndefined*/ undefined, enclosingDeclaration, flags | NodeBuilderFlags.MultilineObjectLiterals, internalFlags, tracker);
     }
 
     function hasGlobalName(name: string): boolean {
@@ -49950,7 +49965,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function literalTypeToNode(type: FreshableType, enclosing: Node, tracker: SymbolTracker): Expression {
-        const enumResult = type.flags & TypeFlags.EnumLike ? nodeBuilder.symbolToExpression(type.symbol, SymbolFlags.Value, enclosing, /*flags*/ undefined, tracker)
+        const enumResult = type.flags & TypeFlags.EnumLike ? nodeBuilder.symbolToExpression(type.symbol, SymbolFlags.Value, enclosing, /*flags*/ undefined, /*internalFlags*/ undefined, tracker)
             : type === trueType ? factory.createTrue() : type === falseType && factory.createFalse();
         if (enumResult) return enumResult;
         const literalValue = (type as LiteralType).value;
@@ -52425,6 +52440,7 @@ interface NodeBuilderContext {
      */
     enclosingFile: SourceFile | undefined;
     flags: NodeBuilderFlags;
+    internalFlags: InternalNodeBuilderFlags;
     tracker: SymbolTrackerImpl;
 
     // State
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
index 166431a745069..536e0cf5d9c22 100644
--- a/src/compiler/transformers/declarations.ts
+++ b/src/compiler/transformers/declarations.ts
@@ -87,6 +87,7 @@ import {
     ImportTypeNode,
     IndexSignatureDeclaration,
     InterfaceDeclaration,
+    InternalNodeBuilderFlags,
     isAmbientModule,
     isArray,
     isArrayBindingElement,
@@ -239,10 +240,11 @@ const declarationEmitNodeBuilderFlags = NodeBuilderFlags.MultilineObjectLiterals
     NodeBuilderFlags.UseTypeOfFunction |
     NodeBuilderFlags.UseStructuralFallback |
     NodeBuilderFlags.AllowEmptyTuple |
-    NodeBuilderFlags.AllowUnresolvedNames |
     NodeBuilderFlags.GenerateNamesForShadowedTypeParams |
     NodeBuilderFlags.NoTruncation;
 
+const declarationEmitInternalNodeBuilderFlags = InternalNodeBuilderFlags.AllowUnresolvedNames;
+
 /**
  * Transforms a ts file into a .d.ts file
  * This process requires type information, which is retrieved through the emit resolver. Because of this,
@@ -429,7 +431,7 @@ export function transformDeclarations(context: TransformationContext) {
                 : Diagnostics.Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit,
             errorNode: s.errorNode || sourceFile,
         }));
-        const result = resolver.getDeclarationStatementsForSourceFile(sourceFile, declarationEmitNodeBuilderFlags, symbolTracker);
+        const result = resolver.getDeclarationStatementsForSourceFile(sourceFile, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags, symbolTracker);
         getSymbolAccessibilityDiagnostic = oldDiag;
         return result;
     }
@@ -696,7 +698,7 @@ export function transformDeclarations(context: TransformationContext) {
             case SyntaxKind.PropertyDeclaration:
             case SyntaxKind.BindingElement:
             case SyntaxKind.VariableDeclaration:
-                typeNode = resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                typeNode = resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags, symbolTracker);
                 break;
             case SyntaxKind.FunctionDeclaration:
             case SyntaxKind.ConstructSignature:
@@ -704,7 +706,7 @@ export function transformDeclarations(context: TransformationContext) {
             case SyntaxKind.MethodDeclaration:
             case SyntaxKind.GetAccessor:
             case SyntaxKind.CallSignature:
-                typeNode = resolver.createReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                typeNode = resolver.createReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags, symbolTracker);
                 break;
             default:
                 Debug.assertNever(node);
@@ -1329,7 +1331,7 @@ export function transformDeclarations(context: TransformationContext) {
                         errorNode: input,
                     });
                     errorFallbackNode = input;
-                    const varDecl = factory.createVariableDeclaration(newId, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
+                    const varDecl = factory.createVariableDeclaration(newId, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
                     errorFallbackNode = undefined;
                     const statement = factory.createVariableStatement(needsDeclare ? [factory.createModifier(SyntaxKind.DeclareKeyword)] : [], factory.createVariableDeclarationList([varDecl], NodeFlags.Const));
 
@@ -1471,7 +1473,7 @@ export function transformDeclarations(context: TransformationContext) {
                             return undefined; // unique symbol or non-identifier name - omit, since there's no syntax that can preserve it
                         }
                         getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                        const type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace, declarationEmitNodeBuilderFlags | NodeBuilderFlags.NoSyntacticPrinter, symbolTracker);
+                        const type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags | InternalNodeBuilderFlags.NoSyntacticPrinter, symbolTracker);
                         getSymbolAccessibilityDiagnostic = oldDiag;
                         const isNonContextualKeywordName = isStringANonContextualKeyword(nameStr);
                         const name = isNonContextualKeywordName ? factory.getGeneratedNameForNode(p.valueDeclaration) : factory.createIdentifier(nameStr);
@@ -1666,7 +1668,7 @@ export function transformDeclarations(context: TransformationContext) {
                         errorNode: extendsClause,
                         typeName: input.name,
                     });
-                    const varDecl = factory.createVariableDeclaration(newId, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(extendsClause.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
+                    const varDecl = factory.createVariableDeclaration(newId, /*exclamationToken*/ undefined, resolver.createTypeOfExpression(extendsClause.expression, input, declarationEmitNodeBuilderFlags, declarationEmitInternalNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
                     const statement = factory.createVariableStatement(needsDeclare ? [factory.createModifier(SyntaxKind.DeclareKeyword)] : [], factory.createVariableDeclarationList([varDecl], NodeFlags.Const));
                     const heritageClauses = factory.createNodeArray(map(input.heritageClauses, clause => {
                         if (clause.token === SyntaxKind.ExtendsKeyword) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 564fa64e1294c..eab2492d3c91a 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5073,14 +5073,14 @@ export interface TypeChecker {
     // TODO: GH#18217 `xToDeclaration` calls are frequently asserted as defined.
     /** Note that the resulting nodes cannot be checked. */
     typeToTypeNode(type: Type, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): TypeNode | undefined;
-    /** @internal */ typeToTypeNode(type: Type, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker?: SymbolTracker): TypeNode | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
-    /** @internal */ typePredicateToTypePredicateNode(typePredicate: TypePredicate, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker?: SymbolTracker): TypePredicateNode | undefined;
+    /** @internal */ typeToTypeNode(type: Type, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags | undefined, tracker?: SymbolTracker): TypeNode | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
+    /** @internal */ typePredicateToTypePredicateNode(typePredicate: TypePredicate, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags | undefined, tracker?: SymbolTracker): TypePredicateNode | undefined;
     /** Note that the resulting nodes cannot be checked. */
     signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): SignatureDeclaration & { typeArguments?: NodeArray<TypeNode>; } | undefined;
-    /** @internal */ signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker?: SymbolTracker): SignatureDeclaration & { typeArguments?: NodeArray<TypeNode>; } | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
+    /** @internal */ signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags | undefined, tracker?: SymbolTracker): SignatureDeclaration & { typeArguments?: NodeArray<TypeNode>; } | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
     /** Note that the resulting nodes cannot be checked. */
     indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): IndexSignatureDeclaration | undefined;
-    /** @internal */ indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, tracker?: SymbolTracker): IndexSignatureDeclaration | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
+    /** @internal */ indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags | undefined, tracker?: SymbolTracker): IndexSignatureDeclaration | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
     /** Note that the resulting nodes cannot be checked. */
     symbolToEntityName(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): EntityName | undefined;
     /** Note that the resulting nodes cannot be checked. */
@@ -5090,7 +5090,7 @@ export interface TypeChecker {
      *
      * @internal
      */
-    symbolToNode(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): Node | undefined;
+    symbolToNode(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags: InternalNodeBuilderFlags | undefined): Node | undefined;
     /** Note that the resulting nodes cannot be checked. */
     symbolToTypeParameterDeclarations(symbol: Symbol, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): NodeArray<TypeParameterDeclaration> | undefined;
     /** Note that the resulting nodes cannot be checked. */
@@ -5459,12 +5459,9 @@ export const enum NodeBuilderFlags {
     AllowEmptyTuple                         = 1 << 19,
     AllowUniqueESSymbolType                 = 1 << 20,
     AllowEmptyIndexInfoType                 = 1 << 21,
-    /** @internal */ WriteComputedProps      = 1 << 30, // { [E.A]: 1 }
-    /** @internal */ NoSyntacticPrinter     = 1 << 31,
     // Errors (cont.)
     AllowNodeModulesRelativePaths           = 1 << 26,
-    /** @internal */ DoNotIncludeSymbolChain = 1 << 27,    // Skip looking up and printing an accessible symbol chain
-    /** @internal */ AllowUnresolvedNames = 1 << 32,
+    
 
     IgnoreErrors = AllowThisInObjectLiteral | AllowQualifiedNameInPlaceOfIdentifier | AllowAnonymousIdentifier | AllowEmptyUnionOrIntersection | AllowEmptyTuple | AllowEmptyIndexInfoType | AllowNodeModulesRelativePaths,
 
@@ -5474,6 +5471,16 @@ export const enum NodeBuilderFlags {
     InInitialEntityName                     = 1 << 24,    // Set when writing the LHS of an entity name or entity name expression
 }
 
+/** @internal */
+// dprint-ignore
+export const enum InternalNodeBuilderFlags {
+    None                                    = 0,
+    WriteComputedProps                      = 1 << 0, // { [E.A]: 1 }
+    NoSyntacticPrinter                      = 1 << 1,
+    DoNotIncludeSymbolChain                 = 1 << 2,    // Skip looking up and printing an accessible symbol chain
+    AllowUnresolvedNames                    = 1 << 3,
+}
+
 // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment
 // dprint-ignore
 export const enum TypeFormatFlags {
@@ -5810,9 +5817,9 @@ export interface EmitResolver {
     requiresAddingImplicitUndefined(node: ParameterDeclaration): boolean;
     isExpandoFunctionDeclaration(node: FunctionDeclaration | VariableDeclaration): boolean;
     getPropertiesOfContainerFunction(node: Declaration): Symbol[];
-    createTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration | PropertyAccessExpression | ElementAccessExpression | BinaryExpression, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
-    createReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
-    createTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: NodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
+    createTypeOfDeclaration(declaration: AccessorDeclaration | VariableLikeDeclaration | PropertyAccessExpression | ElementAccessExpression | BinaryExpression, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
+    createReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
+    createTypeOfExpression(expr: Expression, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker): TypeNode | undefined;
     createLiteralConstValue(node: VariableDeclaration | PropertyDeclaration | PropertySignature | ParameterDeclaration, tracker: SymbolTracker): Expression;
     isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags | undefined, shouldComputeAliasToMarkVisible: boolean): SymbolAccessibilityResult;
     isEntityNameVisible(entityName: EntityNameOrEntityNameExpression, enclosingDeclaration: Node): SymbolVisibilityResult;
@@ -5829,7 +5836,7 @@ export interface EmitResolver {
     getJsxFactoryEntity(location?: Node): EntityName | undefined;
     getJsxFragmentFactoryEntity(location?: Node): EntityName | undefined;
     isBindingCapturedByNode(node: Node, decl: VariableDeclaration | BindingElement): boolean;
-    getDeclarationStatementsForSourceFile(node: SourceFile, flags: NodeBuilderFlags, tracker: SymbolTracker): Statement[] | undefined;
+    getDeclarationStatementsForSourceFile(node: SourceFile, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker): Statement[] | undefined;
     isImportRequiredByAugmentation(decl: ImportDeclaration): boolean;
     isDefinitelyReferenceToGlobalSymbolObject(node: Node): boolean;
 }
diff --git a/src/services/codefixes/fixAddMissingConstraint.ts b/src/services/codefixes/fixAddMissingConstraint.ts
index fad9a8f003a5c..ba1e7aa0279c2 100644
--- a/src/services/codefixes/fixAddMissingConstraint.ts
+++ b/src/services/codefixes/fixAddMissingConstraint.ts
@@ -123,7 +123,7 @@ function addMissingConstraint(changes: textChanges.ChangeTracker, program: Progr
         const scriptTarget = getEmitScriptTarget(program.getCompilerOptions());
         const tracker = getNoopSymbolTrackerWithResolver({ program, host });
         const importAdder = createImportAdder(sourceFile, program, preferences, host);
-        const typeNode = typeToAutoImportableTypeNode(checker, importAdder, constraint, /*contextNode*/ undefined, scriptTarget, /*flags*/ undefined, tracker);
+        const typeNode = typeToAutoImportableTypeNode(checker, importAdder, constraint, /*contextNode*/ undefined, scriptTarget, /*flags*/ undefined, /*internalFlags*/ undefined, tracker);
         if (typeNode) {
             changes.replaceNode(sourceFile, declaration, factory.updateTypeParameterDeclaration(declaration, /*modifiers*/ undefined, declaration.name, typeNode, declaration.default));
             importAdder.writeFixes(changes);
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 190fba39043c0..0f2141fd8d4c8 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -55,6 +55,7 @@ import {
     Identifier,
     idText,
     InterfaceDeclaration,
+    InternalNodeBuilderFlags,
     isCallExpression,
     isClassLike,
     isComputedPropertyName,
@@ -775,7 +776,7 @@ function tryGetContainingMethodDeclaration(node: ClassLikeDeclaration | Interfac
 
 function createPropertyNameFromSymbol(symbol: Symbol, target: ScriptTarget, quotePreference: QuotePreference, checker: TypeChecker) {
     if (isTransientSymbol(symbol)) {
-        const prop = checker.symbolToNode(symbol, SymbolFlags.Value, /*enclosingDeclaration*/ undefined, NodeBuilderFlags.WriteComputedProps);
+        const prop = checker.symbolToNode(symbol, SymbolFlags.Value, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, InternalNodeBuilderFlags.WriteComputedProps);
         if (prop && isComputedPropertyName(prop)) return prop;
     }
     // We're using these nodes as property names in an object literal; no need to quote names when not needed.
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
index d5dacd51dc59d..a0dd5aa5e5899 100644
--- a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
+++ b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -108,7 +108,7 @@ function addMissingDeclarations(
     function createMissingIndexSignatureDeclaration(type: InterfaceType, kind: IndexKind): void {
         const indexInfoOfKind = checker.getIndexInfoOfType(type, kind);
         if (indexInfoOfKind) {
-            insertInterfaceMemberNode(sourceFile, classDeclaration, checker.indexInfoToIndexSignatureDeclaration(indexInfoOfKind, classDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context))!);
+            insertInterfaceMemberNode(sourceFile, classDeclaration, checker.indexInfoToIndexSignatureDeclaration(indexInfoOfKind, classDeclaration, /*flags*/ undefined, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context))!);
         }
     }
 
diff --git a/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts b/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts
index db117935dea2d..9dae7f39679ea 100644
--- a/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts
+++ b/src/services/codefixes/fixMissingTypeAnnotationOnExports.ts
@@ -36,6 +36,7 @@ import {
     hasInitializer,
     hasSyntacticModifier,
     Identifier,
+    InternalNodeBuilderFlags,
     isArrayBindingPattern,
     isArrayLiteralExpression,
     isAssertionExpression,
@@ -160,8 +161,9 @@ const declarationEmitNodeBuilderFlags = NodeBuilderFlags.MultilineObjectLiterals
     | NodeBuilderFlags.UseStructuralFallback
     | NodeBuilderFlags.AllowEmptyTuple
     | NodeBuilderFlags.GenerateNamesForShadowedTypeParams
-    | NodeBuilderFlags.NoTruncation
-    | NodeBuilderFlags.WriteComputedProps;
+    | NodeBuilderFlags.NoTruncation;
+
+const declarationEmitInternalNodeBuilderFlags = InternalNodeBuilderFlags.WriteComputedProps;
 
 enum TypePrintMode {
     // Prints its fully spelled out type
@@ -1096,7 +1098,7 @@ function withContext<T>(
 
     function typeToTypeNode(type: Type, enclosingDeclaration: Node, flags = NodeBuilderFlags.None) {
         let isTruncated = false;
-        const result = typeToAutoImportableTypeNode(typeChecker, importAdder, type, enclosingDeclaration, scriptTarget, declarationEmitNodeBuilderFlags | flags, {
+        const result = typeToAutoImportableTypeNode(typeChecker, importAdder, type, enclosingDeclaration, scriptTarget, declarationEmitNodeBuilderFlags | flags, declarationEmitInternalNodeBuilderFlags, {
             moduleResolverHost: program,
             trackSymbol() {
                 return true;
@@ -1110,7 +1112,7 @@ function withContext<T>(
 
     function typePredicateToTypeNode(typePredicate: TypePredicate, enclosingDeclaration: Node, flags = NodeBuilderFlags.None): TypeNode | undefined {
         let isTruncated = false;
-        const result = typePredicateToAutoImportableTypeNode(typeChecker, importAdder, typePredicate, enclosingDeclaration, scriptTarget, declarationEmitNodeBuilderFlags | flags, {
+        const result = typePredicateToAutoImportableTypeNode(typeChecker, importAdder, typePredicate, enclosingDeclaration, scriptTarget, declarationEmitNodeBuilderFlags | flags, declarationEmitInternalNodeBuilderFlags, {
             moduleResolverHost: program,
             trackSymbol() {
                 return true;
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 0524080520582..b646290db6dee 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -41,6 +41,7 @@ import {
     hasAbstractModifier,
     Identifier,
     idText,
+    InternalNodeBuilderFlags,
     IntersectionType,
     isArrowFunction,
     isAutoAccessorPropertyDeclaration,
@@ -222,7 +223,7 @@ export function addNewNodeForMemberSymbol(
         case SyntaxKind.PropertyDeclaration:
             let flags = NodeBuilderFlags.NoTruncation;
             flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : 0;
-            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
+            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context));
             if (importAdder) {
                 const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
                 if (importableReference) {
@@ -241,7 +242,7 @@ export function addNewNodeForMemberSymbol(
         case SyntaxKind.GetAccessor:
         case SyntaxKind.SetAccessor: {
             Debug.assertIsDefined(declarations);
-            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context));
             const allAccessors = getAllAccessorDeclarations(declarations, declaration as AccessorDeclaration);
             const orderedAccessors = allAccessors.secondAccessor
                 ? [allAccessors.firstAccessor, allAccessors.secondAccessor]
@@ -392,7 +393,7 @@ export function createSignatureDeclarationFromSignature(
         | NodeBuilderFlags.SuppressAnyReturnType
         | NodeBuilderFlags.AllowEmptyTuple
         | (quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : NodeBuilderFlags.None);
-    const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration;
+    const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration;
     if (!signatureDeclaration) {
         return undefined;
     }
@@ -506,6 +507,7 @@ export function createSignatureDeclarationFromCallExpression(
         contextNode,
         scriptTarget,
         NodeBuilderFlags.NoTruncation,
+        /*internalFlags*/ undefined,
         tracker,
     );
 
@@ -519,7 +521,7 @@ export function createSignatureDeclarationFromCallExpression(
     const parameters = createDummyParameters(args.length, names, argumentTypeNodes, /*minArgumentCount*/ undefined, isJs);
     const type = isJs || contextualType === undefined
         ? undefined
-        : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
+        : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, /*internalFlags*/ undefined, tracker);
 
     switch (kind) {
         case SyntaxKind.MethodDeclaration:
@@ -589,8 +591,8 @@ function createTypeParameterName(index: number) {
 }
 
 /** @internal */
-export function typeToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, type: Type, contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
-    let typeNode = checker.typeToTypeNode(type, contextNode, flags, tracker);
+export function typeToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, type: Type, contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
+    let typeNode = checker.typeToTypeNode(type, contextNode, flags, internalFlags, tracker);
     if (typeNode && isImportTypeNode(typeNode)) {
         const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
         if (importableReference) {
@@ -604,8 +606,8 @@ export function typeToAutoImportableTypeNode(checker: TypeChecker, importAdder:
 }
 
 /** @internal */
-export function typePredicateToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, typePredicate: TypePredicate, contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
-    let typePredicateNode = checker.typePredicateToTypePredicateNode(typePredicate, contextNode, flags, tracker);
+export function typePredicateToAutoImportableTypeNode(checker: TypeChecker, importAdder: ImportAdder, typePredicate: TypePredicate, contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker): TypeNode | undefined {
+    let typePredicateNode = checker.typePredicateToTypePredicateNode(typePredicate, contextNode, flags, internalFlags, tracker);
     if (typePredicateNode?.type && isImportTypeNode(typePredicateNode.type)) {
         const importableReference = tryGetAutoImportableReferenceFromTypeNode(typePredicateNode.type, scriptTarget);
         if (importableReference) {
@@ -625,7 +627,7 @@ function typeContainsTypeParameter(type: Type) {
     return type.flags & TypeFlags.TypeParameter;
 }
 
-function getArgumentTypesAndTypeParameters(checker: TypeChecker, importAdder: ImportAdder, instanceTypes: Type[], contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, tracker?: SymbolTracker) {
+function getArgumentTypesAndTypeParameters(checker: TypeChecker, importAdder: ImportAdder, instanceTypes: Type[], contextNode: Node | undefined, scriptTarget: ScriptTarget, flags?: NodeBuilderFlags, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker) {
     // Types to be used as the types of the parameters in the new function
     // E.g. from this source:
     //   added("", 0)
@@ -668,7 +670,7 @@ function getArgumentTypesAndTypeParameters(checker: TypeChecker, importAdder: Im
 
         // Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"
         const widenedInstanceType = checker.getBaseTypeOfLiteralType(instanceType);
-        const argumentTypeNode = typeToAutoImportableTypeNode(checker, importAdder, widenedInstanceType, contextNode, scriptTarget, flags, tracker);
+        const argumentTypeNode = typeToAutoImportableTypeNode(checker, importAdder, widenedInstanceType, contextNode, scriptTarget, flags, internalFlags, tracker);
         if (!argumentTypeNode) {
             continue;
         }
@@ -686,7 +688,7 @@ function getArgumentTypesAndTypeParameters(checker: TypeChecker, importAdder: Im
         // We instead want to output:
         //    function added<T extends string>(value: T) { ... }
         const instanceTypeConstraint = instanceType.isTypeParameter() && instanceType.constraint && !isAnonymousObjectConstraintType(instanceType.constraint)
-            ? typeToAutoImportableTypeNode(checker, importAdder, instanceType.constraint, contextNode, scriptTarget, flags, tracker)
+            ? typeToAutoImportableTypeNode(checker, importAdder, instanceType.constraint, contextNode, scriptTarget, flags, internalFlags, tracker)
             : undefined;
 
         if (argumentTypeParameter) {
@@ -795,7 +797,7 @@ function createMethodImplementingSignatures(
 function getReturnTypeFromSignatures(signatures: readonly Signature[], checker: TypeChecker, context: TypeConstructionContext, enclosingDeclaration: ClassLikeDeclaration): TypeNode | undefined {
     if (length(signatures)) {
         const type = checker.getUnionType(map(signatures, checker.getReturnTypeOfSignature));
-        return checker.typeToTypeNode(type, enclosingDeclaration, NodeBuilderFlags.NoTruncation, getNoopSymbolTrackerWithResolver(context));
+        return checker.typeToTypeNode(type, enclosingDeclaration, NodeBuilderFlags.NoTruncation, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context));
     }
 }
 
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 1300005c8b570..ee67c03331563 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -2324,7 +2324,7 @@ function createObjectLiteralMethod(
                 // We don't support overloads in object literals.
                 return undefined;
             }
-            const typeNode = checker.typeToTypeNode(effectiveType, enclosingDeclaration, builderFlags, codefix.getNoopSymbolTrackerWithResolver({ program, host }));
+            const typeNode = checker.typeToTypeNode(effectiveType, enclosingDeclaration, builderFlags, /*internalFlags*/ undefined, codefix.getNoopSymbolTrackerWithResolver({ program, host }));
             if (!typeNode || !isFunctionTypeNode(typeNode)) {
                 return undefined;
             }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 55ab684196e3c..599d2a8018083 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -3440,7 +3440,7 @@ export function getTypeNodeIfAccessible(type: Type, enclosingScope: Node, progra
     const checker = program.getTypeChecker();
     let typeIsAccessible = true;
     const notAccessible = () => typeIsAccessible = false;
-    const res = checker.typeToTypeNode(type, enclosingScope, NodeBuilderFlags.NoTruncation, {
+    const res = checker.typeToTypeNode(type, enclosingScope, NodeBuilderFlags.NoTruncation, /*internalFlags*/ undefined, {
         trackSymbol: (symbol, declaration, meaning) => {
             typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === SymbolAccessibility.Accessible;
             return !typeIsAccessible;
diff --git a/tests/baselines/reference/ArrowFunction1.types b/tests/baselines/reference/ArrowFunction1.types
index e05ceb280edb9..c0f36308a4c3a 100644
--- a/tests/baselines/reference/ArrowFunction1.types
+++ b/tests/baselines/reference/ArrowFunction1.types
@@ -3,9 +3,9 @@
 === ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^   ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^   ^^^^^^^^^
+>               : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
index 9bce00088aa1c..3b9a05088c0b9 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
@@ -22,7 +22,7 @@ module clodule1 {
 
     function f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index e0920ba869bb1..23e3bcd89500f 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -38,16 +38,16 @@ function f() {
 
 interface I {
     method(args: typeof arguments): void;
->method : (args: typeof arguments) => void
->       : ^    ^^                ^^^^^    
+>method : (args: any) => void
+>       : ^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
 >          : ^^^
 
     fn: (args: typeof arguments) => void;
->fn : (args: typeof arguments) => void
->   : ^    ^^                ^^^^^    
+>fn : (args: any) => void
+>   : ^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
@@ -66,8 +66,8 @@ interface I {
 >          : ^^^
 
     construct: new (args: typeof arguments) => void;
->construct : new (args: typeof arguments) => void
->          : ^^^^^    ^^                ^^^^^    
+>construct : new (args: any) => void
+>          : ^^^^^    ^^^^^^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
index 3477e908a4412..1986b06942f71 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
@@ -6,8 +6,8 @@ class X {
 >  : ^
 
     public f(a: Array) { }
->f : (a: Array) => void
->  : ^ ^^     ^^^^^^^^^
+>f : (a: any) => void
+>  : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
index 2059b6a1d0af5..5c6b02e6e38ea 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
index c67538371823d..82694aa672ecf 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
index b69055519df93..1e9e5af30123a 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^               
+>                                      : ^^^^^^^^^^^^^^^^^^^^^
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^               
+>                                 : ^^^^^^^^^^^^^^^^^^^^^
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^                 
+>    : ^^^^^^^^^^^^^^^^^^^^^^^
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^                 
+>                                 : ^^^^^^^^^^^^^^^^^^^^^^^
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^               
+>   : ^^^^^^^^^^^^^^^^^^^^^
 }
 
 module M {
diff --git a/tests/baselines/reference/badExternalModuleReference.types b/tests/baselines/reference/badExternalModuleReference.types
index 755cfd5afa70b..e2161d64ff872 100644
--- a/tests/baselines/reference/badExternalModuleReference.types
+++ b/tests/baselines/reference/badExternalModuleReference.types
@@ -7,7 +7,7 @@ import a1 = require("garbage");
 
 export declare var a: {
 >a : { (): a1.connectExport; test1: a1.connectModule; }
->  : ^^^^^^                ^^^^^^^^^                ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     test1: a1.connectModule;
 >test1 : a1.connectModule
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index e090eac053745..cc2b3a9a5c1c1 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -147,7 +147,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
 >defer : <R>(dit: typeof Promise) => Promise.Resolver<R>
->      : ^ ^^   ^^              ^^^^^                   
+>      : ^ ^^   ^^              ^^^^^^^^^^^^^^^^^^^^^^^^
 >dit : typeof Promise
 >    : ^^^^^^^^^^^^^^
 >Promise : typeof Promise
diff --git a/tests/baselines/reference/circularBaseTypes.types b/tests/baselines/reference/circularBaseTypes.types
index f15db1ed5a721..9b237c0c33002 100644
--- a/tests/baselines/reference/circularBaseTypes.types
+++ b/tests/baselines/reference/circularBaseTypes.types
@@ -15,8 +15,8 @@ type M3 = M2[keyof M2];  // Error
 >   : ^^^
 
 function f(m: M3) {
->f : (m: M3) => any
->  : ^ ^^  ^^^^^^^^
+>f : (m: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >m : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index d9fd54eb04428..4b8e2b93060cb 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -84,8 +84,8 @@ module m1 {
     }
 
     export function f4(arg1: 
->f4 : (arg1: { [number]: C1; }) => void
->   : ^    ^^                 ^^^^^^^^^
+>f4 : (arg1: {}) => void
+>   : ^    ^^  ^^^^^^^^^
 >arg1 : {}
 >     : ^^
     {
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 1732ef9e66df6..07ec406a76ef9 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -859,11 +859,11 @@ module TypeScriptAllInOne {
 >xx.Foo() : bool
 >         : ^^^^
 >xx.Foo : () => bool
->       : ^^^^^^    
+>       : ^^^^^^^^^^
 >xx : IF
 >   : ^^
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
 >0 : 0
 >  : ^
 >1 : 1
@@ -1290,7 +1290,7 @@ module TypeScriptAllInOne {
     interface IF {
         Foo(): bool;
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
     }
 
     class CLASS implements IF {
@@ -1323,7 +1323,7 @@ module TypeScriptAllInOne {
         }
         public Foo(): bool {
 >Foo : () => bool
->    : ^^^^^^    
+>    : ^^^^^^^^^^
 
             var myEvent = () => { return 1; };
 >myEvent : () => number
diff --git a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
index 1e5e4b1c668a0..ff27f866ca994 100644
--- a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
+++ b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
@@ -21,10 +21,10 @@ import { type Type } from "./type";
 >     : ^^^
 
 export const foo = { ...({} as Type) };
->foo : { x?: { [Enum.A]: 0; }; }
->    : ^^^^^^                ^^^
->{ ...({} as Type) } : { x?: { [Enum.A]: 0; }; }
->                    : ^^^^^^                ^^^
+>foo : { x?: {}; }
+>    : ^^^^^^  ^^^
+>{ ...({} as Type) } : { x?: {}; }
+>                    : ^^^^^^  ^^^
 >({} as Type) : Type
 >             : ^^^^
 >{} as Type : Type
diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
index 02b1bd623bfcd..53024d844f276 100644
--- a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
+++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
@@ -25,5 +25,28 @@ declare module "versions.static" {
 }
 declare module "index" {
     export { versions };
-    import versions from "versions.static";
+    import versions from "js/versions.static";
 }
+
+
+//// [DtsFileErrors]
+
+
+js/index.d.ts(10,26): error TS2307: Cannot find module 'js/versions.static' or its corresponding type declarations.
+
+
+==== js/index.d.ts (1 errors) ====
+    declare module "versions.static" {
+        const _default: {
+            "@a/b": string;
+            "@a/c": string;
+        };
+        export default _default;
+    }
+    declare module "index" {
+        export { versions };
+        import versions from "js/versions.static";
+                             ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'js/versions.static' or its corresponding type declarations.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types
index c159268c6c1fe..81f1035e5f2c0 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.types
+++ b/tests/baselines/reference/errorsInGenericTypeReference.types
@@ -45,9 +45,9 @@ class testClass2<T> {
 }
 var tc2 = new testClass2<{ x: V }>(); // error: could not find symbol V
 >tc2 : testClass2<{ x: V; }>
->    : ^^^^^^^^^^^^^^^^ ^^^^
+>    : ^^^^^^^^^^^^^^^^^^^^^
 >new testClass2<{ x: V }>() : testClass2<{ x: V; }>
->                           : ^^^^^^^^^^^^^^^^ ^^^^
+>                           : ^^^^^^^^^^^^^^^^^^^^^
 >testClass2 : typeof testClass2
 >           : ^^^^^^^^^^^^^^^^^
 >x : V
@@ -73,15 +73,15 @@ class testClass3 {
 
     set a(value: Foo<{ x: V }>) { } // error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >value : Foo<{ x: V; }>
->      : ^^^^^^^^^ ^^^^
+>      : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^ ^^^^
+>         : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 }
@@ -100,7 +100,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 >testFunction2 : (p: Foo<{ x: V; }>) => void
 >              : ^ ^^              ^^^^^^^^^
 >p : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -108,7 +108,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 // in var type annotation
 var f: Foo<{ x: V }>; // error: could not find symbol V
 >f : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -149,7 +149,7 @@ class testClass7 extends Foo<{ x: V }> { } // error: could not find symbol V
 >testClass7 : testClass7
 >           : ^^^^^^^^^^
 >Foo : Foo<{ x: V; }>
->    : ^^^^^^^^^ ^^^^
+>    : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 
@@ -166,7 +166,7 @@ class testClass8 implements IFoo<{ x: V }> { } // error: could not find symbol V
 interface testInterface2 {
     new (a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 >x : V
@@ -182,7 +182,7 @@ interface testInterface2 {
 >method : (a: Foo<{ x: V; }>) => Foo<{ x: V; }>
 >       : ^ ^^              ^^^^^              
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^ ^^^^
+>  : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 >x : V
@@ -190,7 +190,7 @@ interface testInterface2 {
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^ ^^^^
+>         : ^^^^^^^^^^^^^^
 >x : V
 >  : ^
 }
diff --git a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
index 03d26bb153cbd..e92435770566b 100644
--- a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
+++ b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
@@ -17,7 +17,7 @@ class Foo {
 
     f(@decorate user: A.B.C.D.E): void {}
 >f : (user: A.B.C.D.E) => void
->  : ^    ^^         ^^^^^    
+>  : ^    ^^^^^^^^^^^^^^^^    
 >decorate : any
 >         : ^^^
 >user : A.B.C.D.E
diff --git a/tests/baselines/reference/exportNamespace_js.js b/tests/baselines/reference/exportNamespace_js.js
index 4e64bdc174398..180158f7c22f5 100644
--- a/tests/baselines/reference/exportNamespace_js.js
+++ b/tests/baselines/reference/exportNamespace_js.js
@@ -35,6 +35,6 @@ A;
 export class A {
 }
 //// [b.d.ts]
-export type * from "./a";
+export type * from "a";
 //// [c.d.ts]
 export {};
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 45c953a6edaec..1166e17b3ee19 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -31,7 +31,7 @@ declare module "m2" {
 
     function Z2(): X.I;
 >Z2 : () => X.I
->   : ^^^^^^   
+>   : ^^^^^^^^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index 7cfc7f29a1799..6479046c76e2e 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -19,7 +19,7 @@ declare module "m" {
 
     export function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^     
+>    : ^^^^^^^^^^^
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
index 6abf489b85771..5bd8e94d07540 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
@@ -18,7 +18,7 @@ export declare function foo(): X.foo;
 
 export declare function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^     
+>    : ^^^^^^^^^^^
 >X : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types
index 0cc9fc76332e3..4278407983217 100644
--- a/tests/baselines/reference/extendArray.types
+++ b/tests/baselines/reference/extendArray.types
@@ -36,7 +36,7 @@ declare module _Core {
 >collect : (fn: (e: _element) => _element[]) => any[]
 >        : ^  ^^                           ^^^^^     
 >fn : (e: _element) => _element[]
->   : ^ ^^        ^^^^^          
+>   : ^ ^^^^^^^^^^^^^^^          
 >e : _element
 >  : ^^^^^^^^
   }
diff --git a/tests/baselines/reference/functionTypesLackingReturnTypes.types b/tests/baselines/reference/functionTypesLackingReturnTypes.types
index eee1024a9b1d5..1daafaa5f397a 100644
--- a/tests/baselines/reference/functionTypesLackingReturnTypes.types
+++ b/tests/baselines/reference/functionTypesLackingReturnTypes.types
@@ -6,7 +6,7 @@ function f(x: ()) {
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^   
+>  : ^^^^^^^^^
 }
 
 // Error (no '=>')
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
index a411dc6efcaa1..e09690cad7040 100644
--- a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
@@ -2,8 +2,8 @@
 
 === functionVariableInReturnTypeAnnotation.ts ===
 function bar(): typeof b {
->bar : () => typeof b
->    : ^^^^^^        
+>bar : () => any
+>    : ^^^^^^^^^
 >b : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index 09fe11a54013c..6dfc4569d313d 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -435,7 +435,7 @@ module TU {
 >x : T
 >  : ^
 >b : (x: U) => U
->  : ^ ^^ ^^^^^ 
+>  : ^ ^^^^^^^^^
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
index 673dd58110312..94966b98ecdd6 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
@@ -8,9 +8,9 @@ class Foo<T> {
 
     static a = (n: T) => { };
 >a : (n: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >(n: T) => { } : (n: T) => void
->              : ^ ^^ ^^^^^^^^^
+>              : ^ ^^^^^^^^^^^^
 >n : T
 >  : ^
 
@@ -34,9 +34,9 @@ class Foo<T> {
 >((x: T) => x || undefined)(null) : any
 >                                 : ^^^
 >((x: T) => x || undefined) : (x: T) => any
->                           : ^ ^^ ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^
 >(x: T) => x || undefined : (x: T) => any
->                         : ^ ^^ ^^^^^^^^
+>                         : ^ ^^^^^^^^^^^
 >x : T
 >  : ^
 >x || undefined : any
@@ -48,9 +48,9 @@ class Foo<T> {
 
     static e = function (x: T) { return null; }
 >e : (x: T) => any
->  : ^ ^^ ^^^^^^^^
+>  : ^ ^^^^^^^^^^^
 >function (x: T) { return null; } : (x: T) => any
->                                 : ^ ^^ ^^^^^^^^
+>                                 : ^ ^^^^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
index 7aad01faad3f2..5d3d5fe11f6e9 100644
--- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
@@ -19,8 +19,8 @@ foo((arg: Foo) => { return arg.x; });
 >                                     : ^^^
 >foo : (a: any) => any
 >    : ^ ^^^^^^^^^^^^^
->(arg: Foo) => { return arg.x; } : (arg: Foo) => any
->                                : ^   ^^   ^^^^^^^^
+>(arg: Foo) => { return arg.x; } : (arg: any) => any
+>                                : ^   ^^^^^^^^^^^^^
 >arg : any
 >    : ^^^
 >arg.x : any
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
index 74f654b1a760e..7af45bae740c9 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
@@ -10,8 +10,8 @@ module TypeScript {
 >           : ^^^^^^^^^^^^^^^^^^^
 
         static create<A,B,C>(arg1: any, arg2?: any, arg3?: any): MemberName {
->create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => MemberName
->       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => any
+>       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >arg1 : any
 >     : ^^^
 >arg2 : any
@@ -45,8 +45,8 @@ module TypeScript {
 >             : ^^^
 
         public toString<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) {
->toString : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) => any
->         : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^^^^^^^
+>toString : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean) => any
+>         : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -61,12 +61,12 @@ module TypeScript {
 >                                                                : ^^^
 >this.getScopedNameEx(scopeSymbol, useConstraintInName) : any
 >                                                       : ^^^
->this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                     : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                     : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >this : this
 >     : ^^^^
->getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -79,8 +79,8 @@ module TypeScript {
 >  : ^^^
         }
         public getScopedNameEx<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) {
->getScopedNameEx : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -191,12 +191,12 @@ module TypeScript {
                 return MemberName.create(elementMemberName, "", "[]");
 >MemberName.create(elementMemberName, "", "[]") : any
 >                                               : ^^^
->MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
->                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
+>                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >MemberName : typeof MemberName
 >           : ^^^^^^^^^^^^^^^^^
->create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
->       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
+>create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
+>       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
 >elementMemberName : any
 >                  : ^^^
 >"" : ""
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
index 7d12f8b399ff6..b8d61e618b3d4 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
index b289f43a0a8db..428b8ad4ca384 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
@@ -18,14 +18,14 @@ var c: C;
 >  : ^^^
 
 var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,10 +36,10 @@ var d: { [x: C]: C };
 >  : ^^^
 
 var e = (x: C) => { var y: C; return y; }
->e : (x: C) => any
->  : ^ ^^ ^^^^^^^^
->(x: C) => { var y: C; return y; } : (x: C) => any
->                                  : ^ ^^ ^^^^^^^^
+>e : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>(x: C) => { var y: C; return y; } : (x: any) => any
+>                                  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -48,8 +48,8 @@ var e = (x: C) => { var y: C; return y; }
 >  : ^^^
 
 function f(x: C): C { var y: C; return y; }
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -58,12 +58,12 @@ function f(x: C): C { var y: C; return y; }
 >  : ^^^
 
 var g = function f(x: C): C { var y: C; return y; }
->g : (x: C) => C
->  : ^ ^^ ^^^^^ 
->function f(x: C): C { var y: C; return y; } : (x: C) => C
->                                            : ^ ^^ ^^^^^ 
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>function f(x: C): C { var y: C; return y; } : (x: any) => any
+>                                            : ^ ^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
index 02c324df4a2ba..d618ec2c442c3 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
@@ -15,14 +15,14 @@ var c: I;
 >  : ^^^
 
 var a: { x: I };
->a : { x: I; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 var b: { (x: I): I };
->b : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -33,10 +33,10 @@ var d: { [x: I]: I };
 >  : ^^^
 
 var e = (x: I) => { var y: I; return y; }
->e : (x: I) => any
->  : ^ ^^ ^^^^^^^^
->(x: I) => { var y: I; return y; } : (x: I) => any
->                                  : ^ ^^ ^^^^^^^^
+>e : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>(x: I) => { var y: I; return y; } : (x: any) => any
+>                                  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -45,8 +45,8 @@ var e = (x: I) => { var y: I; return y; }
 >  : ^^^
 
 function f(x: I): I { var y: I; return y; }
->f : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -55,12 +55,12 @@ function f(x: I): I { var y: I; return y; }
 >  : ^^^
 
 var g = function f(x: I): I { var y: I; return y; }
->g : (x: I) => I
->  : ^ ^^ ^^^^^ 
->function f(x: I): I { var y: I; return y; } : (x: I) => I
->                                            : ^ ^^ ^^^^^ 
->f : (x: I) => I
->  : ^ ^^ ^^^^^ 
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
+>function f(x: I): I { var y: I; return y; } : (x: any) => any
+>                                            : ^ ^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
index 1b4e7fc2df006..65c8e58e17514 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: C; }
->  : ^^^^^ ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>b : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: C) => C
->  : ^ ^^ ^^^^^ 
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.types b/tests/baselines/reference/genericsWithoutTypeParameters1.types
index d53f00d368de8..37257696d399b 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.types
@@ -33,8 +33,8 @@ var i2: I<C>;
 >   : ^^^^^^
 
 function foo(x: C, y: I) { }
->foo : (x: C, y: I) => void
->    : ^ ^^ ^^ ^^ ^^^^^^^^^
+>foo : (x: any, y: any) => void
+>    : ^ ^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -49,8 +49,8 @@ function foo2(x: C<I>, y: I<C>) { }
 >  : ^^^^^^
 
 var x: { a: C } = { a: new C<number>() };
->x : { a: C; }
->  : ^^^^^ ^^^
+>x : { a: any; }
+>  : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >{ a: new C<number>() } : { a: C<number>; }
@@ -63,8 +63,8 @@ var x: { a: C } = { a: new C<number>() };
 >  : ^^^^^^^^
 
 var x2: { a: I } = { a: { bar() { return 1 } } };
->x2 : { a: I; }
->   : ^^^^^ ^^^
+>x2 : { a: any; }
+>   : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >{ a: { bar() { return 1 } } } : { a: { bar(): number; }; }
@@ -106,8 +106,8 @@ class A<T> { }
 >  : ^^^^
 
 function f<T>(x: T): A {
->f : <T>(x: T) => A
->  : ^ ^^ ^^ ^^^^^ 
+>f : <T>(x: T) => any
+>  : ^ ^^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/importTypeGeneric.types b/tests/baselines/reference/importTypeGeneric.types
index 89f99fcf06016..80bda6bda5986 100644
--- a/tests/baselines/reference/importTypeGeneric.types
+++ b/tests/baselines/reference/importTypeGeneric.types
@@ -14,8 +14,8 @@ export interface Foo {
 }
 === usage.ts ===
 export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
->getFooFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo
->           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^             
+>getFooFrom : <T extends "./a" | "./b">(v: T) => any
+>           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
 >v : T
 >  : ^
 
@@ -27,8 +27,8 @@ export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 }
 
 export function getFooValueFrom<T extends "./a" | "./b">(v: T): import(T).Foo["a"] {
->getFooValueFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo["a"]
->                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^                  
+>getFooValueFrom : <T extends "./a" | "./b">(v: T) => any
+>                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
 >v : T
 >  : ^
 
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types
index f935bc74710e4..4595882098610 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.types
+++ b/tests/baselines/reference/importedModuleAddToGlobal.types
@@ -44,7 +44,7 @@ module C {
 
     function hello(): b.B { return null; }
 >hello : () => b.B
->      : ^^^^^^   
+>      : ^^^^^^^^^
 >b : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/intrinsicKeyword.types b/tests/baselines/reference/intrinsicKeyword.types
index ae043729da5d0..992bddd32605f 100644
--- a/tests/baselines/reference/intrinsicKeyword.types
+++ b/tests/baselines/reference/intrinsicKeyword.types
@@ -7,7 +7,7 @@ let e1: intrinsic;
 
 let e2: { intrinsic: intrinsic };
 >e2 : { intrinsic: intrinsic; }
->   : ^^^^^^^^^^^^^         ^^^
+>   : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >intrinsic : intrinsic
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js b/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
index c519ea52a7c7d..84d324d266bf0 100644
--- a/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
+++ b/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
@@ -46,7 +46,7 @@ declare class Test {
 //// [index.d.ts]
 export default X;
 export type Options = {
-    test?: typeof import("./Test.js").default | undefined;
+    test?: typeof import("Test").default | undefined;
 };
 /**
  * @typedef {Object} Options
@@ -57,6 +57,49 @@ declare class X extends Test {
      * @param {Options} options
      */
     constructor(options: Options);
-    test: import("./Test.js").default | undefined;
+    test: import("Test").default | undefined;
 }
 import Test from './test/Test.js';
+
+
+//// [DtsFileErrors]
+
+
+index.d.ts(3,26): error TS2307: Cannot find module 'Test' or its corresponding type declarations.
+index.d.ts(14,18): error TS2307: Cannot find module 'Test' or its corresponding type declarations.
+
+
+==== test/Test.d.ts (0 errors) ====
+    export default Test;
+    /** @module test/Test */
+    declare class Test {
+    }
+    
+==== Test.d.ts (0 errors) ====
+    export default Test;
+    /** @module Test */
+    declare class Test {
+    }
+    
+==== index.d.ts (2 errors) ====
+    export default X;
+    export type Options = {
+        test?: typeof import("Test").default | undefined;
+                             ~~~~~~
+!!! error TS2307: Cannot find module 'Test' or its corresponding type declarations.
+    };
+    /**
+     * @typedef {Object} Options
+     * @property {typeof import("./Test.js").default} [test]
+     */
+    declare class X extends Test {
+        /**
+         * @param {Options} options
+         */
+        constructor(options: Options);
+        test: import("Test").default | undefined;
+                     ~~~~~~
+!!! error TS2307: Cannot find module 'Test' or its corresponding type declarations.
+    }
+    import Test from './test/Test.js';
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
index bbe7783650f78..2347be18fa551 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -63,8 +63,36 @@ declare class Foo extends Bar {
 declare namespace Foo {
     export { Strings };
 }
-import Bar = require("./bar");
+import Bar = require("bar.js");
 declare namespace Strings {
     let a: string;
     let b: string;
 }
+
+
+//// [DtsFileErrors]
+
+
+out/cls.d.ts(7,22): error TS2307: Cannot find module 'bar.js' or its corresponding type declarations.
+
+
+==== out/cls.d.ts (1 errors) ====
+    export = Foo;
+    declare class Foo extends Bar {
+    }
+    declare namespace Foo {
+        export { Strings };
+    }
+    import Bar = require("/.src/bar.js");
+                         ~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'bar.js' or its corresponding type declarations.
+    declare namespace Strings {
+        let a: string;
+        let b: string;
+    }
+    
+==== out/bar.d.ts (0 errors) ====
+    export = Bar;
+    declare class Bar {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
index f66220b072547..c21f18dd919e3 100644
--- a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
+++ b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
@@ -18,5 +18,5 @@ export class Thing {
 }
 //// [reexport.d.ts]
 export { Thing };
-import Thing_1 = require("./thing");
+import Thing_1 = require("thing.js");
 import Thing = Thing_1.Thing;
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt b/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
deleted file mode 100644
index 8880526df413f..0000000000000
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-index.js(4,1): error TS6232: Declaration augments declaration in another file. This cannot be serialized.
-
-
-==== index.js (1 errors) ====
-    const m = require("./exporter");
-    
-    module.exports = m.default;
-    module.exports.memberName = "thing";
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS6232: Declaration augments declaration in another file. This cannot be serialized.
-!!! related TS6233 exporter.js:1:10: This is the declaration being augmented. Consider moving the augmenting declaration into the same file.
-    
-==== exporter.js (0 errors) ====
-    function validate() {}
-    
-    export default validate;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.js b/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
index ed5d9dbe7807f..101a434ec6880 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
@@ -23,13 +23,35 @@ module.exports = m.default;
 module.exports.memberName = "thing";
 
 
+//// [exporter.d.ts]
+export default validate;
+declare function validate(): void;
+declare namespace validate {
+    export {};
+}
 //// [index.d.ts]
 declare const _exports: typeof m.default;
 export = _exports;
-import m = require("./exporter");
+import m = require("exporter");
 
 
-!!!! File out/exporter.d.ts missing from original emit, but present in noCheck emit
-//// [exporter.d.ts]
-export default validate;
-declare function validate(): void;
+//// [DtsFileErrors]
+
+
+out/index.d.ts(3,20): error TS2307: Cannot find module 'exporter' or its corresponding type declarations.
+
+
+==== out/index.d.ts (1 errors) ====
+    declare const _exports: typeof m.default;
+    export = _exports;
+    import m = require("/.src/exporter");
+                       ~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'exporter' or its corresponding type declarations.
+    
+==== out/exporter.d.ts (0 errors) ====
+    export default validate;
+    declare function validate(): void;
+    declare namespace validate {
+        export {};
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
index 35d4703037c93..635cd5dfd22c4 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
@@ -7,7 +7,6 @@ const m = require("./exporter");
 >require("./exporter") : typeof m
 >                      : ^^^^^^^^
 >require : any
->        : ^^^
 >"./exporter" : "./exporter"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
index 6d7c77bd70dd7..6784e764267e4 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
@@ -47,5 +47,31 @@ declare namespace exports {
     export { Sub };
 }
 declare class Sub {
-    instance: import(".");
+    instance: import("index");
 }
+
+
+//// [DtsFileErrors]
+
+
+out/index.d.ts(13,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
+
+
+==== out/index.d.ts (1 errors) ====
+    export = exports;
+    declare class exports {
+        /**
+         * @param {number} p
+         */
+        constructor(p: number);
+        t: number;
+    }
+    declare namespace exports {
+        export { Sub };
+    }
+    declare class Sub {
+        instance: import("index");
+                         ~~~~~~~
+!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
deleted file mode 100644
index bb3b678582382..0000000000000
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-jsDeclarationsExportAssignedConstructorFunctionWithSub.js(4,1): error TS9005: Declaration emit for this file requires using private name 'Sub'. An explicit type annotation may unblock declaration emit.
-jsDeclarationsExportAssignedConstructorFunctionWithSub.js(4,1): error TS9005: Declaration emit for this file requires using private name 'exports'. An explicit type annotation may unblock declaration emit.
-
-
-==== jsDeclarationsExportAssignedConstructorFunctionWithSub.js (2 errors) ====
-    /**
-     * @param {number} p
-     */
-    module.exports = function (p) {
-    ~~~~~~
-!!! error TS9005: Declaration emit for this file requires using private name 'Sub'. An explicit type annotation may unblock declaration emit.
-    ~~~~~~
-!!! error TS9005: Declaration emit for this file requires using private name 'exports'. An explicit type annotation may unblock declaration emit.
-        this.t = 12 + p;
-    }
-    module.exports.Sub = function() {
-        this.instance = new module.exports(10);
-    }
-    module.exports.Sub.prototype = { }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
index 59a5017c576b5..6b0a57d9d5208 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
@@ -24,3 +24,33 @@ module.exports.Sub = function () {
     this.instance = new module.exports(10);
 };
 module.exports.Sub.prototype = {};
+
+
+//// [jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts]
+declare const _exports: {
+    (p: number): void;
+    new (p: number): exports;
+    Sub: typeof Sub;
+};
+export = _exports;
+
+
+//// [DtsFileErrors]
+
+
+out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts(3,22): error TS2304: Cannot find name 'exports'.
+out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts(4,17): error TS2304: Cannot find name 'Sub'.
+
+
+==== out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts (2 errors) ====
+    declare const _exports: {
+        (p: number): void;
+        new (p: number): exports;
+                         ~~~~~~~
+!!! error TS2304: Cannot find name 'exports'.
+        Sub: typeof Sub;
+                    ~~~
+!!! error TS2304: Cannot find name 'Sub'.
+    };
+    export = _exports;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
index 835fccd045001..e9929796c5dfe 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
@@ -22,7 +22,6 @@ module.exports = function (p) {
 >this.t = 12 + p : number
 >                : ^^^^^^
 >this.t : any
->       : ^^^
 >this : this
 >     : ^^^^
 >t : any
@@ -54,7 +53,6 @@ module.exports.Sub = function() {
 >this.instance = new module.exports(10) : exports
 >                                       : ^^^^^^^
 >this.instance : any
->              : ^^^
 >this : this
 >     : ^^^^
 >instance : any
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
index 018aebdfec9cf..05965858dac15 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
@@ -45,4 +45,27 @@ export = Container;
 declare class Container {
     usage: Obj;
 }
-import Obj = require("./obj");
+import Obj = require("obj.js");
+
+
+//// [DtsFileErrors]
+
+
+out/index.d.ts(5,22): error TS2307: Cannot find module 'obj.js' or its corresponding type declarations.
+
+
+==== out/index.d.ts (1 errors) ====
+    export = Container;
+    declare class Container {
+        usage: Obj;
+    }
+    import Obj = require("/.src/obj.js");
+                         ~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'obj.js' or its corresponding type declarations.
+    
+==== out/obj.d.ts (0 errors) ====
+    export = Obj;
+    declare class Obj {
+        x: number;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js
index 133e66706bbca..568f2288f19e5 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.js
+++ b/tests/baselines/reference/jsDeclarationsExportForms.js
@@ -166,10 +166,10 @@ export class Foo {
 //// [func.d.ts]
 export function func(): void;
 //// [bar.d.ts]
-export * from "./cls";
+export * from "cls";
 //// [bar2.d.ts]
-export * from "./func";
-export * from "./cls";
+export * from "func";
+export * from "cls";
 //// [baz.d.ts]
 export { Foo };
 import { Foo } from "./cls";
@@ -184,15 +184,92 @@ export { ns as classContainer };
 import * as ns from "./cls";
 //// [cjs.d.ts]
 export { ns };
-import ns = require("./cls");
+import ns = require("cls");
 //// [cjs2.d.ts]
 export = ns;
-import ns = require("./cls");
+import ns = require("cls");
 //// [cjs3.d.ts]
 export { ns };
-import ns = require("./cls");
+import ns = require("cls");
 //// [cjs4.d.ts]
 export { ns as names };
-import ns = require("./cls");
+import ns = require("cls");
 //// [includeAll.d.ts]
 export {};
+
+
+//// [DtsFileErrors]
+
+
+out/bar.d.ts(1,15): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+out/bar2.d.ts(1,15): error TS2307: Cannot find module 'func' or its corresponding type declarations.
+out/bar2.d.ts(2,15): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+out/cjs.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+out/cjs2.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+out/cjs3.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+out/cjs4.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+
+
+==== out/cls.d.ts (0 errors) ====
+    export class Foo {
+    }
+    
+==== out/func.d.ts (0 errors) ====
+    export function func(): void;
+    
+==== out/bar.d.ts (1 errors) ====
+    export * from "cls";
+                  ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/bar2.d.ts (2 errors) ====
+    export * from "func";
+                  ~~~~~~
+!!! error TS2307: Cannot find module 'func' or its corresponding type declarations.
+    export * from "cls";
+                  ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/baz.d.ts (0 errors) ====
+    export { Foo };
+    import { Foo } from "./cls";
+    
+==== out/bat.d.ts (0 errors) ====
+    export default ns;
+    import * as ns from "./cls";
+    
+==== out/ban.d.ts (0 errors) ====
+    export { ns };
+    import * as ns from "./cls";
+    
+==== out/bol.d.ts (0 errors) ====
+    export { ns as classContainer };
+    import * as ns from "./cls";
+    
+==== out/cjs.d.ts (1 errors) ====
+    export { ns };
+    import ns = require("cls");
+                        ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/cjs2.d.ts (1 errors) ====
+    export = ns;
+    import ns = require("cls");
+                        ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/cjs3.d.ts (1 errors) ====
+    export { ns };
+    import ns = require("cls");
+                        ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/cjs4.d.ts (1 errors) ====
+    export { ns as names };
+    import ns = require("cls");
+                        ~~~~~
+!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
+    
+==== out/includeAll.d.ts (0 errors) ====
+    export {};
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
index 508ee7828f408..b0db6610b85fa 100644
--- a/tests/baselines/reference/jsDeclarationsExportFormsErr.js
+++ b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
@@ -71,10 +71,10 @@ export class Foo {
 }
 //// [bar.d.ts]
 export = ns;
-import ns = require("./cls");
+import ns = require("cls");
 //// [bin.d.ts]
 export {};
 //// [globalNs.d.ts]
-export * from "./cls";
+export * from "cls";
 //// [includeAll.d.ts]
 export {};
diff --git a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
index 3a79339339c98..893f21a275c79 100644
--- a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
+++ b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
@@ -59,4 +59,23 @@ export class FancyError extends Error {
 }
 //// [index.d.ts]
 export { errors };
-import errors = require("./errors");
+import errors = require("utils/errors");
+
+
+//// [DtsFileErrors]
+
+
+out/index.d.ts(2,25): error TS2307: Cannot find module 'utils/errors' or its corresponding type declarations.
+
+
+==== out/index.d.ts (1 errors) ====
+    export { errors };
+    import errors = require("/.src/utils/errors");
+                            ~~~~~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'utils/errors' or its corresponding type declarations.
+    
+==== out/errors.d.ts (0 errors) ====
+    export class FancyError extends Error {
+        constructor(status: any);
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsFunctions.js b/tests/baselines/reference/jsDeclarationsFunctions.js
index a3676ec28ae4c..1f430b494989d 100644
--- a/tests/baselines/reference/jsDeclarationsFunctions.js
+++ b/tests/baselines/reference/jsDeclarationsFunctions.js
@@ -165,7 +165,7 @@ declare class Cls {
 export function g(a: {
     x: string;
 }, b: {
-    y: typeof import(".").b;
+    y: typeof import("index").b;
 }): void;
 /**
  * @param {{x: string}} a
@@ -174,6 +174,74 @@ export function g(a: {
 declare function hh(a: {
     x: string;
 }, b: {
-    y: typeof import(".").b;
+    y: typeof import("index").b;
 }): void;
 export { hh as h, i as ii, j as jj };
+
+
+//// [DtsFileErrors]
+
+
+out/index.d.ts(42,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
+out/index.d.ts(51,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
+
+
+==== out/index.d.ts (2 errors) ====
+    export function a(): void;
+    export function b(): void;
+    export namespace b {
+        let cat: string;
+    }
+    export function c(): void;
+    export namespace c {
+        export { Cls };
+    }
+    /**
+     * @param {number} a
+     * @param {number} b
+     * @return {string}
+     */
+    export function d(a: number, b: number): string;
+    /**
+     * @template T,U
+     * @param {T} a
+     * @param {U} b
+     * @return {T & U}
+     */
+    export function e<T, U>(a: T, b: U): T & U;
+    /**
+     * @template T
+     * @param {T} a
+     */
+    export function f<T>(a: T): T;
+    export namespace f {
+        export { f as self };
+    }
+    export function i(): void;
+    export function j(): void;
+    declare class Cls {
+    }
+    /**
+     * @param {{x: string}} a
+     * @param {{y: typeof b}} b
+     */
+    export function g(a: {
+        x: string;
+    }, b: {
+        y: typeof import("index").b;
+                         ~~~~~~~
+!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
+    }): void;
+    /**
+     * @param {{x: string}} a
+     * @param {{y: typeof b}} b
+     */
+    declare function hh(a: {
+        x: string;
+    }, b: {
+        y: typeof import("index").b;
+                         ~~~~~~~
+!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
+    }): void;
+    export { hh as h, i as ii, j as jj };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
index bd27e71768a9e..757223804f054 100644
--- a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
+++ b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
@@ -96,4 +96,4 @@ export const testFnTypes: {
 export namespace testFnTypes {
     type input = boolean | myTypes.typeC;
 }
-import { myTypes } from "./file.js";
+import { myTypes } from "file";
diff --git a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
index d8f635713a538..63253285e6b5a 100644
--- a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
+++ b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
@@ -62,6 +62,33 @@ export class SomeClass {
     a(): number;
 }
 //// [main.d.ts]
-import { SomeClass } from "./lib";
-import { SomeClass as Another } from "./lib";
+import { SomeClass } from "lib";
+import { SomeClass as Another } from "lib";
 export { SomeClass, Another };
+
+
+//// [DtsFileErrors]
+
+
+out/main.d.ts(1,27): error TS2307: Cannot find module 'lib' or its corresponding type declarations.
+out/main.d.ts(2,38): error TS2307: Cannot find module 'lib' or its corresponding type declarations.
+
+
+==== out/main.d.ts (2 errors) ====
+    import { SomeClass } from "/.src/lib";
+                              ~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'lib' or its corresponding type declarations.
+    import { SomeClass as Another } from "/.src/lib";
+                                         ~~~~~~~~~~~
+!!! error TS2307: Cannot find module 'lib' or its corresponding type declarations.
+    export { SomeClass, Another };
+    
+==== out/lib.d.ts (0 errors) ====
+    /**
+     * @param {string} a
+     */
+    export function bar(a: string): string;
+    export class SomeClass {
+        a(): number;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
index b24408dac789b..daedc30c073c1 100644
--- a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
+++ b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
@@ -58,6 +58,6 @@ export class Render {
      */
     addRectangle(): Rectangle;
 }
-import { Rectangle } from "./rectangle";
+import { Rectangle } from "rectangle";
 //// [test.d.ts]
 export {};
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt
deleted file mode 100644
index 5d2892b1fae3a..0000000000000
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-index.js(1,1): error TS9006: Declaration emit for this file requires using private name 'Item' from module '"some-mod"'. An explicit type annotation may unblock declaration emit.
-
-
-==== index.js (1 errors) ====
-    const items = require("./some-mod")();
-    ~~~~~
-!!! error TS9006: Declaration emit for this file requires using private name 'Item' from module '"some-mod"'. An explicit type annotation may unblock declaration emit.
-    module.exports = items;
-==== some-mod.d.ts (0 errors) ====
-    interface Item {
-        x: string;
-    }
-    declare function getItems(): Item[];
-    export = getItems;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
index 02068c5cef713..eb6604c53a83f 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
@@ -13,3 +13,28 @@ module.exports = items;
 //// [index.js]
 var items = require("./some-mod")();
 module.exports = items;
+
+
+//// [index.d.ts]
+export = items;
+declare const items: Item[];
+
+
+//// [DtsFileErrors]
+
+
+out/index.d.ts(2,22): error TS2304: Cannot find name 'Item'.
+
+
+==== out/index.d.ts (1 errors) ====
+    export = items;
+    declare const items: Item[];
+                         ~~~~
+!!! error TS2304: Cannot find name 'Item'.
+    
+==== some-mod.d.ts (0 errors) ====
+    interface Item {
+        x: string;
+    }
+    declare function getItems(): Item[];
+    export = getItems;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
index 0b6e7aa016495..18f1c4b2bae96 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
@@ -9,7 +9,6 @@ const items = require("./some-mod")();
 >require("./some-mod") : () => Item[]
 >                      : ^^^^^^^^^^  
 >require : any
->        : ^^^
 >"./some-mod" : "./some-mod"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js b/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
index fbaea7f86741d..ca4300d5c45c3 100644
--- a/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
+++ b/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
@@ -25,7 +25,7 @@ export default {
 //// [index.d.ts]
 declare namespace _default {
     namespace computed {
-        let panels: import("./helper").Computed;
+        let panels: import("/helper").Computed;
     }
 }
 export default _default;
diff --git a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
index cbfbd71f3ce4b..cc6fd4db7284d 100644
--- a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
+++ b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
@@ -6,5 +6,5 @@ function f(x) {}
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^   
+>  : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocOuterTypeParameters1.types b/tests/baselines/reference/jsdocOuterTypeParameters1.types
index e09bc426c3e91..104c89b19a52e 100644
--- a/tests/baselines/reference/jsdocOuterTypeParameters1.types
+++ b/tests/baselines/reference/jsdocOuterTypeParameters1.types
@@ -4,9 +4,9 @@
 /** @return {T} */
 const dedupingMixin = function(mixin) {};
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^ 
+>              : ^     ^^^^^^^^^^^
 >function(mixin) {} : (mixin: any) => T
->                   : ^     ^^^^^^^^^^ 
+>                   : ^     ^^^^^^^^^^^
 >mixin : any
 >      : ^^^
 
@@ -17,7 +17,7 @@ const PropertyAccessors = dedupingMixin(() => {
 >dedupingMixin(() => {  class Bar {    static bar() { this.prototype.foo(); }  }}) : T
 >                                                                                  : ^
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^ 
+>              : ^     ^^^^^^^^^^^
 >() => {  class Bar {    static bar() { this.prototype.foo(); }  }} : () => void
 >                                                                   : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
index 03e0733209e4e..60aba05e6ac88 100644
--- a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
+++ b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
@@ -7,5 +7,5 @@
  */
 let x;
 >x : (arg0: any, arg1: foo) => any
->  : ^^^^^^^   ^^^^^^^^   ^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
index fa4c2be52ec06..7e9a79fe8921a 100644
--- a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
+++ b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
@@ -5,8 +5,8 @@
  * @param {Ty} x
  */
 function f(x) {}
->f : (x: Ty) => void
->  : ^ ^^  ^^^^^^^^^
+>f : (x: CantResolveThis) => void
+>  : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : CantResolveThis
 >  : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/lambdaArgCrash.types b/tests/baselines/reference/lambdaArgCrash.types
index 2905a3006e235..b04d53e722cd8 100644
--- a/tests/baselines/reference/lambdaArgCrash.types
+++ b/tests/baselines/reference/lambdaArgCrash.types
@@ -69,7 +69,7 @@ class ItemSetEvent extends Event {
 >add : (listener: (items: ItemSet) => void) => void
 >    : ^        ^^                        ^^^^^^^^^
 >listener : (items: ItemSet) => void
->         : ^     ^^       ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^    
 >items : ItemSet
 >      : ^^^^^^^
 
@@ -83,7 +83,7 @@ class ItemSetEvent extends Event {
 >add : (listener: () => any) => void
 >    : ^        ^^         ^^^^^    
 >listener : (items: ItemSet) => void
->         : ^     ^^       ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^    
 
 	}
 
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index bab7b13a03a3b..276995eccc15c 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -25,7 +25,7 @@ function f2() {
     // Local types are not in scope in parameters and return types
     function f(x: T): T {
 >f : (x: T) => T
->  : ^ ^^ ^^^^^ 
+>  : ^ ^^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/missingTypeArguments1.types b/tests/baselines/reference/missingTypeArguments1.types
index 4c52121e6efdb..7674a030f35cc 100644
--- a/tests/baselines/reference/missingTypeArguments1.types
+++ b/tests/baselines/reference/missingTypeArguments1.types
@@ -11,8 +11,8 @@ class X<T> {
 >  : ^^^^
 
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 }
 var a: X<number>;
 >a : X<number>
@@ -73,8 +73,8 @@ class X6<T> {
 >   : ^^^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 }
 var a6: X6<number>;
 >a6 : X6<number>
diff --git a/tests/baselines/reference/missingTypeArguments2.types b/tests/baselines/reference/missingTypeArguments2.types
index 7e209f39c7ca0..c5c87c749a5ef 100644
--- a/tests/baselines/reference/missingTypeArguments2.types
+++ b/tests/baselines/reference/missingTypeArguments2.types
@@ -6,12 +6,12 @@ class A<T> { }
 >  : ^^^^
 
 var x: () => A;
->x : () => A
->  : ^^^^^^ 
+>x : () => any
+>  : ^^^^^^^^^
 
 (a: A) => { };
->(a: A) => { } : (a: A) => void
->              : ^ ^^ ^^^^^^^^^
+>(a: A) => { } : (a: any) => void
+>              : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -20,6 +20,6 @@ var y: A<A>;
 >  : ^^^^^^
 
 (): A => null;
->(): A => null : () => A
->              : ^^^^^^ 
+>(): A => null : () => any
+>              : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index f120426e0aa12..088b4523199a2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -80,7 +80,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^ 
+>    : ^^^^^^^
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 17d9fc3f6e23e..8e0116c6d7fe1 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -75,7 +75,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^ 
+>    : ^^^^^^^
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleExportAssignment7.types b/tests/baselines/reference/moduleExportAssignment7.types
index 4124a6d377230..2ccb64f0d5d12 100644
--- a/tests/baselines/reference/moduleExportAssignment7.types
+++ b/tests/baselines/reference/moduleExportAssignment7.types
@@ -159,8 +159,8 @@ function jstypes(a, b, c, d, e, f, g) {
  * @param {typeof import("./mod").literal} g
  */
 function jsvalues(a, b, c, d, e, f, g) {
->jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
->         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
+>jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
+>         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
 >a : typeof Thing
 >  : ^^^^^^^^^^^^
 >b : typeof AnotherThing
@@ -227,8 +227,8 @@ function jsvalues(a, b, c, d, e, f, g) {
 
 === index.ts ===
 function types(
->types : (a: import("./mod").Thing, b: import("./mod").AnotherThing, c: import("./mod").foo, d: import("./mod").qux, e: import("./mod").baz, f: import("./mod").buz, g: import("./mod").literal) => any
->      : ^ ^^                     ^^ ^^                            ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                       ^^^^^^^^
+>types : (a: any, b: any, c: any, d: any, e: any, f: import("./mod").buz, g: any) => any
+>      : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^                   ^^ ^^^^^^^^^^^^^
 
     a: import('./mod').Thing,
 >a : any
@@ -309,8 +309,8 @@ function types(
 }
 
 function values(
->values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
->       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
+>values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
+>       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
 
     a: typeof import('./mod').Thing,
 >a : typeof Thing
diff --git a/tests/baselines/reference/moduleInTypePosition1.types b/tests/baselines/reference/moduleInTypePosition1.types
index 893230662904c..54a4064d3a58d 100644
--- a/tests/baselines/reference/moduleInTypePosition1.types
+++ b/tests/baselines/reference/moduleInTypePosition1.types
@@ -8,9 +8,9 @@ import WinJS = require('./moduleInTypePosition1_0');
 
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^     ^^^^^^^^^
+>                   : ^  ^^^^^^^^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/modulePreserve4.js b/tests/baselines/reference/modulePreserve4.js
index 536f52f3a4897..7e0cd761f17b1 100644
--- a/tests/baselines/reference/modulePreserve4.js
+++ b/tests/baselines/reference/modulePreserve4.js
@@ -223,6 +223,6 @@ export {};
 //// [main3.d.cts]
 export {};
 //// [main4.d.cts]
-export const x: typeof import("./g");
+export const x: typeof import("/g");
 //// [dummy.d.ts]
 export {};
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
index ab36f42fb2ec6..689b28d1d837e 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
@@ -21,7 +21,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(role: Role) =>        this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : (role: Role) => any
->                                                                                                                          : ^    ^^    ^^^^^^^^
+>                                                                                                                          : ^    ^^^^^^^^^^^^^^
 >role : Role
 >     : ^^^^
 
@@ -49,7 +49,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(data: ng.IHttpPromiseCallbackArg<Role>) => data.data : (data: ng.IHttpPromiseCallbackArg<Role>) => any
->                                                      : ^    ^^                                ^^^^^^^^
+>                                                      : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >data : ng.IHttpPromiseCallbackArg<Role>
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ng : any
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.types b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
index aa78989a9c06c..11c001306ea4f 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.types
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
@@ -6,8 +6,8 @@ class A<T>{
 >  : ^^^^
  
  foo(): A{
->foo : () => A
->    : ^^^^^^ 
+>foo : () => any
+>    : ^^^^^^^^^
 
   return null;
  }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
index e5b849c6a2add..9e3db23d9d6c5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
@@ -62,24 +62,24 @@ function foo3(x: any) { }
 >  : ^^^
 
 function foo4(x: typeof b);
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: typeof b); // error
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: any) { }
->foo4 : { (x: typeof b): any; (x: typeof b): any; }
->     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
+>foo4 : { (x: any): any; (x: any): any; }
+>     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/parser553699.types b/tests/baselines/reference/parser553699.types
index fcc70394c1163..8fb75c3898941 100644
--- a/tests/baselines/reference/parser553699.types
+++ b/tests/baselines/reference/parser553699.types
@@ -8,7 +8,7 @@ class Foo {
   constructor() { }
   public banana (x: public) { }
 >banana : (x: public) => void
->       : ^ ^^      ^^^^^^^^^
+>       : ^ ^^^^^^^^^^^^^^^^^
 >x : public
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.types b/tests/baselines/reference/parserArrowFunctionExpression10.types
index bc288ad26b247..0b639062c960d 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression10.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression10.types
@@ -3,11 +3,11 @@
 === fileJs.js ===
 a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colon
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^ 
+>                            : ^ ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^ 
+>               : ^ ^^^^^^^^^^^
 >b : any
 >  : ^^^
 >(d) : any
@@ -24,11 +24,11 @@ a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colo
 === fileTs.ts ===
 a ? (b) : c => (d) : e => f
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^ 
+>                            : ^ ^^^^^^^^^^^
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^ 
+>               : ^ ^^^^^^^^^^^
 >b : any
 >  : ^^^
 >(d) : any
diff --git a/tests/baselines/reference/parserArrowFunctionExpression17.types b/tests/baselines/reference/parserArrowFunctionExpression17.types
index 72350d6f59991..44f811dbf5975 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression17.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression17.types
@@ -9,7 +9,7 @@ a ? b : (c) : d => e // Not legal JS; "Unexpected token ':'" at last colon
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^ 
+>             : ^ ^^^^^^^^^^^
 >c : any
 >  : ^^^
 >e : any
@@ -24,7 +24,7 @@ a ? b : (c) : d => e
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^ 
+>             : ^ ^^^^^^^^^^^
 >c : any
 >  : ^^^
 >e : any
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
index b1e08f535a2e3..c081e3e394ad1 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
@@ -3,7 +3,7 @@
 === parserErrantEqualsGreaterThanAfterFunction2.ts ===
 function f(p: A) => p;
 >f : (p: A) => any
->  : ^ ^^ ^^^^^^^^
+>  : ^ ^^^^^^^^^^^
 >p : A
 >  : ^
 >p : any
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
index 938154e596aeb..72675341e2934 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
@@ -7,7 +7,7 @@ class Foo {
 
     public banana (x: break) { }
 >banana : (x: break) => void
->       : ^ ^^     ^^^^^^^^^
+>       : ^ ^^^^^^^^^^^^^^^^
 >x : break
 >  : ^^^^^
 }
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.types b/tests/baselines/reference/parserGenericsInTypeContexts1.types
index 35f7edf331487..6845b6326233c 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.types
@@ -37,14 +37,14 @@ var v6: K<T>[];
 
 function f1(a: E<T>) {
 >f1 : (a: E<T>) => void
->   : ^ ^^    ^^^^^^^^^
+>   : ^ ^^^^^^^^^^^^^^^
 >a : E<T>
 >  : ^^^^
 }
 
 function f2(): F<T> {
 >f2 : () => F<T>
->   : ^^^^^^    
+>   : ^^^^^^^^^^
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.types b/tests/baselines/reference/parserGenericsInTypeContexts2.types
index 98fe0538ca6f5..928bcee3118b6 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.types
@@ -37,14 +37,14 @@ var v6: K<X<T>, Y<Z<T>>>[];
 
 function f1(a: E<X<T>, Y<Z<T>>>) {
 >f1 : (a: E<X<T>, Y<Z<T>>>) => void
->   : ^ ^^                ^^^^^^^^^
+>   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >a : E<X<T>, Y<Z<T>>>
 >  : ^^^^^^^^^^^^^^^^
 }
 
 function f2(): F<X<T>, Y<Z<T>>> {
 >f2 : () => F<X<T>, Y<Z<T>>>
->   : ^^^^^^                
+>   : ^^^^^^^^^^^^^^^^^^^^^^
 }
 
 
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
index 1745d213e848e..e1c3c66d02847 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
@@ -7,7 +7,7 @@ class C {
 
     where(filter: Iterator<T, boolean>): Query<T> {
 >where : (filter: Iterator<T, boolean>) => Query<T>
->      : ^      ^^                    ^^^^^        
+>      : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >filter : Iterator<T, boolean>
 >       : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserObjectType5.types b/tests/baselines/reference/parserObjectType5.types
index fe93d5cf1efd4..620abab9f30ff 100644
--- a/tests/baselines/reference/parserObjectType5.types
+++ b/tests/baselines/reference/parserObjectType5.types
@@ -3,7 +3,7 @@
 === parserObjectType5.ts ===
 var v: {
 >v : { <T>(): any; A: B; }
->  : ^^^ ^^^^^^^^^^^^^ ^^^
+>  : ^^^ ^^^^^^^^^^^^^^^^^
 
    A: B
 >A : B
diff --git a/tests/baselines/reference/parserObjectType6.types b/tests/baselines/reference/parserObjectType6.types
index 9d487d9bbee74..990045de90b02 100644
--- a/tests/baselines/reference/parserObjectType6.types
+++ b/tests/baselines/reference/parserObjectType6.types
@@ -3,7 +3,7 @@
 === parserObjectType6.ts ===
 var v: {
 >v : { a: B; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 
    a: B
 >a : B
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index 3ba5196d8a27d..d81700003e0da 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -886,7 +886,7 @@ module TypeScript {
 
     function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number,
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tokenId : TokenID
 >        : ^^^^^^^
 >reservation : number
@@ -1015,7 +1015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Any, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "any", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Any : TokenID.Any
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1065,7 +1065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bool, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "boolean", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Bool : TokenID.Bool
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1115,7 +1115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Break, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "break", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Break : TokenID.Break
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1165,7 +1165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Case, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "case", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Case : TokenID.Case
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1215,7 +1215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Catch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "catch", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Catch : TokenID.Catch
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1265,7 +1265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Class, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "class", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Class : TokenID.Class
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1315,7 +1315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Const, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "const", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Const : TokenID.Const
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1365,7 +1365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Continue, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "continue", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Continue : TokenID.Continue
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1415,7 +1415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Debugger, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.Debugger, "debugger", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Debugger : TokenID.Debugger
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1465,7 +1465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Default, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "default", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Default : TokenID.Default
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1515,7 +1515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Delete, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Delete, "delete", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Delete : TokenID.Delete
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1565,7 +1565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Do, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "do", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Do : TokenID.Do
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1615,7 +1615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Else, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "else", ErrorRecoverySet.Else) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Else : TokenID.Else
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1665,7 +1665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Enum, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "enum", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Enum : TokenID.Enum
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1715,7 +1715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Export, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "export", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Export : TokenID.Export
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1765,7 +1765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Extends, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "extends", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Extends : TokenID.Extends
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1815,7 +1815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Declare, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "declare", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Declare : TokenID.Declare
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1865,7 +1865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.False, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "false", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.False : TokenID.False
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1915,7 +1915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Finally, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "finally", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Finally : TokenID.Finally
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1965,7 +1965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.For, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "for", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.For : TokenID.For
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2015,7 +2015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Function, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "function", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Function : TokenID.Function
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2065,7 +2065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Constructor, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "constructor", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Constructor : TokenID.Constructor
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2115,7 +2115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Get, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "get", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Get : TokenID.Get
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2165,7 +2165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Set, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "set", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Set : TokenID.Set
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2215,7 +2215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.If, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "if", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.If : TokenID.If
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2265,7 +2265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Implements, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "implements", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Implements : TokenID.Implements
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2315,7 +2315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Import, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "import", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Import : TokenID.Import
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2365,7 +2365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.In, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.In, OperatorPrecedence.None, NodeType.None, "in", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.In : TokenID.In
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2415,7 +2415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.InstanceOf, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.InstOf, OperatorPrecedence.None, NodeType.None, "instanceof", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.InstanceOf : TokenID.InstanceOf
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2465,7 +2465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Interface, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "interface", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Interface : TokenID.Interface
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2515,7 +2515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Let, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "let", ErrorRecoverySet.None) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Let : TokenID.Let
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2565,7 +2565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Module, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "module", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Module : TokenID.Module
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2615,7 +2615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.New, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "new", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.New : TokenID.New
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2665,7 +2665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Number, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "number", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Number : TokenID.Number
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2715,7 +2715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Null, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "null", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Null : TokenID.Null
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2765,7 +2765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Package, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "package", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Package : TokenID.Package
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2815,7 +2815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Private, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "private", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Private : TokenID.Private
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2865,7 +2865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Protected, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "protected", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Protected : TokenID.Protected
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2915,7 +2915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Public, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "public", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Public : TokenID.Public
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2965,7 +2965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Return, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "return", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Return : TokenID.Return
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3015,7 +3015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Static, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "static", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Static : TokenID.Static
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3065,7 +3065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.String, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "string", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.String : TokenID.String
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3115,7 +3115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Super, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "super", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Super : TokenID.Super
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3165,7 +3165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Switch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "switch", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Switch : TokenID.Switch
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3215,7 +3215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.This, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "this", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.This : TokenID.This
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3265,7 +3265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Throw, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "throw", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Throw : TokenID.Throw
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3315,7 +3315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.True, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "true", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.True : TokenID.True
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3365,7 +3365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Try, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "try", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Try : TokenID.Try
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3415,7 +3415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.TypeOf, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Typeof, "typeof", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.TypeOf : TokenID.TypeOf
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3465,7 +3465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Var, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "var", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Var : TokenID.Var
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3515,7 +3515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Void, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Void, "void", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Void : TokenID.Void
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3565,7 +3565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.With, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.With, "with", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.With : TokenID.With
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3615,7 +3615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.While, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "while", ErrorRecoverySet.While) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.While : TokenID.While
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3665,7 +3665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Yield, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "yield", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Yield : TokenID.Yield
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3715,7 +3715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Identifier, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "identifier", ErrorRecoverySet.ID) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Identifier : TokenID.Identifier
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3765,7 +3765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.NumberLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "numberLiteral", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.NumberLiteral : TokenID.NumberLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3815,7 +3815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.RegularExpressionLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "regex", ErrorRecoverySet.RegExp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.RegularExpressionLiteral : TokenID.RegularExpressionLiteral
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3865,7 +3865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.StringLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "qstring", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.StringLiteral : TokenID.StringLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3916,7 +3916,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Semicolon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ";", ErrorRecoverySet.SColon) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Semicolon : TokenID.Semicolon
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3966,7 +3966,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ")", ErrorRecoverySet.RParen) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseParen : TokenID.CloseParen
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4016,7 +4016,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "]", ErrorRecoverySet.RBrack) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseBracket : TokenID.CloseBracket
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4066,7 +4066,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "{", ErrorRecoverySet.LCurly) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenBrace : TokenID.OpenBrace
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4116,7 +4116,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "}", ErrorRecoverySet.RCurly) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CloseBrace : TokenID.CloseBrace
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4166,7 +4166,7 @@ module TypeScript {
 >setTokenInfo(TokenID.DotDotDot, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "...", ErrorRecoverySet.None) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.DotDotDot : TokenID.DotDotDot
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4217,7 +4217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Comma, Reservation.None, OperatorPrecedence.Comma, NodeType.Comma, OperatorPrecedence.None, NodeType.None, ",", ErrorRecoverySet.Comma) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Comma : TokenID.Comma
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4267,7 +4267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Equals, Reservation.None, OperatorPrecedence.Assignment, NodeType.Asg, OperatorPrecedence.None, NodeType.None, "=", ErrorRecoverySet.Asg) : void
 >                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Equals : TokenID.Equals
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4317,7 +4317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAdd, OperatorPrecedence.None, NodeType.None, "+=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PlusEquals : TokenID.PlusEquals
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4367,7 +4367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgSub, OperatorPrecedence.None, NodeType.None, "-=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.MinusEquals : TokenID.MinusEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4417,7 +4417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AsteriskEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMul, OperatorPrecedence.None, NodeType.None, "*=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AsteriskEquals : TokenID.AsteriskEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4467,7 +4467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.SlashEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgDiv, OperatorPrecedence.None, NodeType.None, "/=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.SlashEquals : TokenID.SlashEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4517,7 +4517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PercentEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMod, OperatorPrecedence.None, NodeType.None, "%=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PercentEquals : TokenID.PercentEquals
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4567,7 +4567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAnd, OperatorPrecedence.None, NodeType.None, "&=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AmpersandEquals : TokenID.AmpersandEquals
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4617,7 +4617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CaretEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgXor, OperatorPrecedence.None, NodeType.None, "^=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.CaretEquals : TokenID.CaretEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4667,7 +4667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgOr, OperatorPrecedence.None, NodeType.None, "|=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.BarEquals : TokenID.BarEquals
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4717,7 +4717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgLsh, OperatorPrecedence.None, NodeType.None, "<<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanLessThanEquals : TokenID.LessThanLessThanEquals
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4767,7 +4767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRsh, OperatorPrecedence.None, NodeType.None, ">>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanEquals
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4817,7 +4817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRs2, OperatorPrecedence.None, NodeType.None, ">>>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanGreaterThanEquals
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4867,7 +4867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Question, Reservation.None, OperatorPrecedence.Conditional, NodeType.ConditionalExpression, OperatorPrecedence.None, NodeType.None, "?", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Question : TokenID.Question
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4917,7 +4917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Colon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ":", ErrorRecoverySet.Colon) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Colon : TokenID.Colon
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4967,7 +4967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarBar, Reservation.None, OperatorPrecedence.LogicalOr, NodeType.LogOr, OperatorPrecedence.None, NodeType.None, "||", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.BarBar : TokenID.BarBar
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5017,7 +5017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandAmpersand, Reservation.None, OperatorPrecedence.LogicalAnd, NodeType.LogAnd, OperatorPrecedence.None, NodeType.None, "&&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.AmpersandAmpersand : TokenID.AmpersandAmpersand
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5067,7 +5067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bar, Reservation.None, OperatorPrecedence.BitwiseOr, NodeType.Or, OperatorPrecedence.None, NodeType.None, "|", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Bar : TokenID.Bar
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5117,7 +5117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Caret, Reservation.None, OperatorPrecedence.BitwiseExclusiveOr, NodeType.Xor, OperatorPrecedence.None, NodeType.None, "^", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Caret : TokenID.Caret
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5167,7 +5167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.And, Reservation.None, OperatorPrecedence.BitwiseAnd, NodeType.And, OperatorPrecedence.None, NodeType.None, "&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.And : TokenID.And
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5217,7 +5217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eq, OperatorPrecedence.None, NodeType.None, "==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsEquals : TokenID.EqualsEquals
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5267,7 +5267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Ne, OperatorPrecedence.None, NodeType.None, "!=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.ExclamationEquals : TokenID.ExclamationEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5317,7 +5317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eqv, OperatorPrecedence.None, NodeType.None, "===", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsEqualsEquals : TokenID.EqualsEqualsEquals
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5367,7 +5367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.NEqv, OperatorPrecedence.None, NodeType.None, "!==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.ExclamationEqualsEquals : TokenID.ExclamationEqualsEquals
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5417,7 +5417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Lt, OperatorPrecedence.None, NodeType.None, "<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThan : TokenID.LessThan
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5467,7 +5467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Le, OperatorPrecedence.None, NodeType.None, "<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanEquals : TokenID.LessThanEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5517,7 +5517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Gt, OperatorPrecedence.None, NodeType.None, ">", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThan : TokenID.GreaterThan
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5567,7 +5567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Ge, OperatorPrecedence.None, NodeType.None, ">=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanEquals : TokenID.GreaterThanEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5617,7 +5617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Lsh, OperatorPrecedence.None, NodeType.None, "<<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.LessThanLessThan : TokenID.LessThanLessThan
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5667,7 +5667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rsh, OperatorPrecedence.None, NodeType.None, ">>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThan : TokenID.GreaterThanGreaterThan
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5717,7 +5717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rs2, OperatorPrecedence.None, NodeType.None, ">>>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThan : TokenID.GreaterThanGreaterThanGreaterThan
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5767,7 +5767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Plus, Reservation.None, OperatorPrecedence.Additive, NodeType.Add, OperatorPrecedence.Unary, NodeType.Pos, "+", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Plus : TokenID.Plus
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5817,7 +5817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Minus, Reservation.None, OperatorPrecedence.Additive, NodeType.Sub, OperatorPrecedence.Unary, NodeType.Neg, "-", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Minus : TokenID.Minus
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5867,7 +5867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Asterisk, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mul, OperatorPrecedence.None, NodeType.None, "*", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Asterisk : TokenID.Asterisk
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5917,7 +5917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Slash, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Div, OperatorPrecedence.None, NodeType.None, "/", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Slash : TokenID.Slash
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5967,7 +5967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Percent, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mod, OperatorPrecedence.None, NodeType.None, "%", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Percent : TokenID.Percent
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6017,7 +6017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Tilde, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Not, "~", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Tilde : TokenID.Tilde
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6067,7 +6067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Exclamation, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.LogNot, "!", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Exclamation : TokenID.Exclamation
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6117,7 +6117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusPlus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.IncPre, "++", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.PlusPlus : TokenID.PlusPlus
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6167,7 +6167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusMinus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.DecPre, "--", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.MinusMinus : TokenID.MinusMinus
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6217,7 +6217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "(", ErrorRecoverySet.LParen) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenParen : TokenID.OpenParen
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6267,7 +6267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "[", ErrorRecoverySet.LBrack) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.OpenBracket : TokenID.OpenBracket
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6317,7 +6317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Dot, Reservation.None, OperatorPrecedence.Unary, NodeType.None, OperatorPrecedence.None, NodeType.None, ".", ErrorRecoverySet.Dot) : void
 >                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.Dot : TokenID.Dot
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6367,7 +6367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EndOfFile, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "<EOF>", ErrorRecoverySet.EOF) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EndOfFile : TokenID.EndOfFile
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6417,7 +6417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsGreaterThan, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "=>", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID.EqualsGreaterThan : TokenID.EqualsGreaterThan
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index d941bb4c4efe1..2eee22d1ed353 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -136,7 +136,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -336,7 +336,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -777,7 +777,7 @@ module TypeScript {
 
         public print(context: PrintContext) {
 >print : (context: PrintContext) => void
->      : ^       ^^            ^^^^^^^^^
+>      : ^       ^^^^^^^^^^^^^^^^^^^^^^^
 >context : PrintContext
 >        : ^^^^^^^^^^^^
 
@@ -1055,7 +1055,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1095,7 +1095,7 @@ module TypeScript {
 
         public netFreeUses(container: Symbol, freeUses: StringHashTable) {
 >netFreeUses : (container: Symbol, freeUses: StringHashTable) => void
->            : ^         ^^      ^^        ^^               ^^^^^^^^^
+>            : ^         ^^      ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 >freeUses : StringHashTable
@@ -1411,7 +1411,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1666,7 +1666,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -1725,7 +1725,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -1797,7 +1797,7 @@ module TypeScript {
 >this.members[i].typeCheck(typeFlow) : any
 >                                    : ^^^
 >this.members[i].typeCheck : (typeFlow: TypeFlow) => any
->                          : ^        ^^        ^^^^^^^^
+>                          : ^        ^^^^^^^^^^^^^^^^^^
 >this.members[i] : AST
 >                : ^^^
 >this.members : AST[]
@@ -1809,7 +1809,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
                 }
@@ -2018,7 +2018,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2037,7 +2037,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2062,7 +2062,7 @@ module TypeScript {
 
         public static fromToken(token: Token): Identifier {
 >fromToken : (token: Token) => Identifier
->          : ^     ^^     ^^^^^          
+>          : ^     ^^^^^^^^^^^^          
 >token : Token
 >      : ^^^^^
 
@@ -2119,7 +2119,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2174,7 +2174,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2201,7 +2201,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2390,7 +2390,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2398,11 +2398,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Expression
 >      : ^^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2437,7 +2437,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2992,7 +2992,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -3835,7 +3835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -3884,7 +3884,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -4035,7 +4035,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -4777,7 +4777,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5447,7 +5447,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5466,7 +5466,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5657,7 +5657,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5703,7 +5703,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5946,7 +5946,7 @@ module TypeScript {
         
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5973,7 +5973,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6082,7 +6082,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6161,7 +6161,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6286,7 +6286,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6571,7 +6571,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6864,7 +6864,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6988,7 +6988,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7111,7 +7111,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7728,7 +7728,7 @@ module TypeScript {
 
         public buildControlFlow(): ControlFlowContext {
 >buildControlFlow : () => ControlFlowContext
->                 : ^^^^^^                  
+>                 : ^^^^^^^^^^^^^^^^^^^^^^^^
 
             var entry = new BasicBlock();
 >entry : any
@@ -7760,9 +7760,9 @@ module TypeScript {
 
             var controlFlowPrefix = (ast: AST, parent: AST, walker: IAstWalker) => {
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >(ast: AST, parent: AST, walker: IAstWalker) => {                ast.addToControlFlow(walker.state);                return ast;            } : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7774,11 +7774,11 @@ module TypeScript {
 >ast.addToControlFlow(walker.state) : void
 >                                   : ^^^^
 >ast.addToControlFlow : (context: ControlFlowContext) => void
->                     : ^       ^^                  ^^^^^    
+>                     : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >ast : AST
 >    : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >walker.state : any
 >             : ^^^
 >walker : IAstWalker
@@ -7805,7 +7805,7 @@ module TypeScript {
 >getWalker : any
 >          : ^^^
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
 >context : any
 >        : ^^^
 
@@ -7846,7 +7846,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -7865,7 +7865,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -8540,7 +8540,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -8873,7 +8873,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9231,7 +9231,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9250,7 +9250,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9506,7 +9506,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9525,7 +9525,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9592,7 +9592,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9611,7 +9611,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9682,7 +9682,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9735,7 +9735,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9815,7 +9815,7 @@ module TypeScript {
 >this.labels.members[i].emit(emitter, tokenId, startLine) : void
 >                                                         : ^^^^
 >this.labels.members[i].emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->                            : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>                            : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >this.labels.members[i] : AST
 >                       : ^^^
 >this.labels.members : AST[]
@@ -9831,7 +9831,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9844,7 +9844,7 @@ module TypeScript {
 >this.stmt.emit(emitter, tokenId, true) : void
 >                                       : ^^^^
 >this.stmt.emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->               : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>               : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9852,7 +9852,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9889,7 +9889,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9921,7 +9921,7 @@ module TypeScript {
 >this.stmt.typeCheck(typeFlow) : any
 >                              : ^^^
 >this.stmt.typeCheck : (typeFlow: TypeFlow) => any
->                    : ^        ^^        ^^^^^^^^
+>                    : ^        ^^^^^^^^^^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9929,7 +9929,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9940,7 +9940,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10017,7 +10017,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10245,7 +10245,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10381,7 +10381,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -10524,7 +10524,7 @@ module TypeScript {
 
         public setResolvedTarget(parser: Parser, stmt: Statement): boolean {
 >setResolvedTarget : (parser: Parser, stmt: Statement) => boolean
->                  : ^      ^^      ^^    ^^         ^^^^^       
+>                  : ^      ^^^^^^^^^^    ^^         ^^^^^       
 >parser : Parser
 >       : ^^^^^^
 >stmt : Statement
@@ -10655,7 +10655,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10663,11 +10663,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10706,7 +10706,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10886,7 +10886,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11043,7 +11043,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11062,7 +11062,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11365,7 +11365,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11578,7 +11578,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11597,7 +11597,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11872,7 +11872,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12101,7 +12101,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -12120,7 +12120,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12128,7 +12128,7 @@ module TypeScript {
 >this.cond.addToControlFlow(context) : void
 >                                    : ^^^^
 >this.cond.addToControlFlow : (context: ControlFlowContext) => void
->                           : ^       ^^                  ^^^^^    
+>                           : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >this.cond : AST
 >          : ^^^
 >this : this
@@ -12136,7 +12136,7 @@ module TypeScript {
 >cond : AST
 >     : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12530,7 +12530,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12676,7 +12676,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12684,11 +12684,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^                  ^^^^^    
+>                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12705,7 +12705,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13357,7 +13357,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -13582,7 +13582,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13652,7 +13652,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -13942,7 +13942,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14257,7 +14257,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14276,7 +14276,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^    
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -14779,7 +14779,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14919,7 +14919,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^        ^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14984,7 +14984,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15299,7 +15299,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15451,7 +15451,7 @@ module TypeScript {
         // if there are break statements that match this switch, then just link cond block with block after switch
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -15730,7 +15730,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15882,7 +15882,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15951,7 +15951,7 @@ module TypeScript {
         // for now, assume all cases are reachable, regardless of whether some cases fall through
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16170,7 +16170,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16189,7 +16189,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16397,7 +16397,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16480,7 +16480,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16557,7 +16557,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16803,7 +16803,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16914,7 +16914,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17163,7 +17163,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17266,7 +17266,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17365,7 +17365,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17400,7 +17400,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17531,7 +17531,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17710,7 +17710,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17835,7 +17835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18288,7 +18288,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -18387,7 +18387,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^                  ^^^^^^^^^
+>                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -18452,7 +18452,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^        ^^^^^^^^^
+>          : ^        ^^^^^^^^^^^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18687,7 +18687,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
+>     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index 6763d907264ef..28627d5cc3cf2 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -13,7 +13,7 @@ module TypeScript {
     export interface IAstWalker {
         walk(ast: AST, parent: AST): AST;
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -136,7 +136,7 @@ module TypeScript {
 
         public walk(ast: AST, parent: AST): AST {
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -355,7 +355,7 @@ module TypeScript {
 
         public walk(ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): AST {
 >walk : (ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => AST
->     : ^   ^^   ^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^   
+>     : ^   ^^^^^^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^^^^
 >ast : AST
 >    : ^^^
 >pre : IAstWalkCallback
@@ -371,7 +371,7 @@ module TypeScript {
 >this.getWalker(pre, post, options, state).walk(ast, null) : AST
 >                                                          : ^^^
 >this.getWalker(pre, post, options, state).walk : (ast: AST, parent: AST) => AST
->                                               : ^   ^^   ^^      ^^   ^^^^^   
+>                                               : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >this.getWalker(pre, post, options, state) : IAstWalker
 >                                          : ^^^^^^^^^^
 >this.getWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
@@ -389,7 +389,7 @@ module TypeScript {
 >state : any
 >      : ^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
         }
@@ -481,7 +481,7 @@ module TypeScript {
 
             this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.None] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -497,15 +497,15 @@ module TypeScript {
 >None : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Empty] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -521,15 +521,15 @@ module TypeScript {
 >Empty : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EmptyExpr] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -545,15 +545,15 @@ module TypeScript {
 >EmptyExpr : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.True] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -569,15 +569,15 @@ module TypeScript {
 >True : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.False] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -593,15 +593,15 @@ module TypeScript {
 >False : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.This] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -617,15 +617,15 @@ module TypeScript {
 >This : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Super] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -641,15 +641,15 @@ module TypeScript {
 >Super : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.QString] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -665,15 +665,15 @@ module TypeScript {
 >QString : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Regex] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -689,15 +689,15 @@ module TypeScript {
 >Regex : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Null] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -713,15 +713,15 @@ module TypeScript {
 >Null : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArrayLit] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -737,15 +737,15 @@ module TypeScript {
 >ArrayLit : any
 >         : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                       : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                       : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ObjectLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -761,15 +761,15 @@ module TypeScript {
 >ObjectLit : any
 >          : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Void] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -785,15 +785,15 @@ module TypeScript {
 >Void : any
 >     : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comma] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -809,15 +809,15 @@ module TypeScript {
 >Comma : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Pos] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -833,15 +833,15 @@ module TypeScript {
 >Pos : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Neg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -857,15 +857,15 @@ module TypeScript {
 >Neg : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Delete] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -881,15 +881,15 @@ module TypeScript {
 >Delete : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Await] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -905,15 +905,15 @@ module TypeScript {
 >Await : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.In] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -929,15 +929,15 @@ module TypeScript {
 >In : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Dot] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -953,15 +953,15 @@ module TypeScript {
 >Dot : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.From] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -977,15 +977,15 @@ module TypeScript {
 >From : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Is] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1001,15 +1001,15 @@ module TypeScript {
 >Is : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InstOf] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1025,15 +1025,15 @@ module TypeScript {
 >InstOf : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Typeof] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1049,15 +1049,15 @@ module TypeScript {
 >Typeof : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NumberLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1073,15 +1073,15 @@ module TypeScript {
 >NumberLit : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Name] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1097,15 +1097,15 @@ module TypeScript {
 >Name : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren;
 >this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeRef] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1121,15 +1121,15 @@ module TypeScript {
 >TypeRef : any
 >        : ^^^
 >ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Index] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1145,15 +1145,15 @@ module TypeScript {
 >Index : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Call] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1169,15 +1169,15 @@ module TypeScript {
 >Call : any
 >     : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.New] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1193,15 +1193,15 @@ module TypeScript {
 >New : any
 >    : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Asg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1217,15 +1217,15 @@ module TypeScript {
 >Asg : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAdd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1241,15 +1241,15 @@ module TypeScript {
 >AsgAdd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgSub] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1265,15 +1265,15 @@ module TypeScript {
 >AsgSub : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgDiv] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1289,15 +1289,15 @@ module TypeScript {
 >AsgDiv : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMul] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1313,15 +1313,15 @@ module TypeScript {
 >AsgMul : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMod] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1337,15 +1337,15 @@ module TypeScript {
 >AsgMod : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1361,15 +1361,15 @@ module TypeScript {
 >AsgAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgXor] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1385,15 +1385,15 @@ module TypeScript {
 >AsgXor : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1409,15 +1409,15 @@ module TypeScript {
 >AsgOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgLsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1433,15 +1433,15 @@ module TypeScript {
 >AsgLsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1457,15 +1457,15 @@ module TypeScript {
 >AsgRsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRs2] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1481,15 +1481,15 @@ module TypeScript {
 >AsgRs2 : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren;
 >this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                                                                                     : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ConditionalExpression] : IAstWalkChildren
 >                                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1505,15 +1505,15 @@ module TypeScript {
 >ConditionalExpression : any
 >                      : ^^^
 >ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1529,15 +1529,15 @@ module TypeScript {
 >LogOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1553,15 +1553,15 @@ module TypeScript {
 >LogAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Or] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1577,15 +1577,15 @@ module TypeScript {
 >Or : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Xor] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1601,15 +1601,15 @@ module TypeScript {
 >Xor : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.And] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1625,15 +1625,15 @@ module TypeScript {
 >And : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eq] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1649,15 +1649,15 @@ module TypeScript {
 >Eq : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ne] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1673,15 +1673,15 @@ module TypeScript {
 >Ne : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eqv] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1697,15 +1697,15 @@ module TypeScript {
 >Eqv : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NEqv] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1721,15 +1721,15 @@ module TypeScript {
 >NEqv : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1745,15 +1745,15 @@ module TypeScript {
 >Lt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Le] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1769,15 +1769,15 @@ module TypeScript {
 >Le : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Gt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1793,15 +1793,15 @@ module TypeScript {
 >Gt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ge] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1817,15 +1817,15 @@ module TypeScript {
 >Ge : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Add] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1841,15 +1841,15 @@ module TypeScript {
 >Add : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Sub] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1865,15 +1865,15 @@ module TypeScript {
 >Sub : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mul] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1889,15 +1889,15 @@ module TypeScript {
 >Mul : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Div] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1913,15 +1913,15 @@ module TypeScript {
 >Div : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mod] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1937,15 +1937,15 @@ module TypeScript {
 >Mod : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1961,15 +1961,15 @@ module TypeScript {
 >Lsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1985,15 +1985,15 @@ module TypeScript {
 >Rsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rs2] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2009,15 +2009,15 @@ module TypeScript {
 >Rs2 : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Not] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2033,15 +2033,15 @@ module TypeScript {
 >Not : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogNot] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2057,15 +2057,15 @@ module TypeScript {
 >LogNot : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2081,15 +2081,15 @@ module TypeScript {
 >IncPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2105,15 +2105,15 @@ module TypeScript {
 >DecPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2129,15 +2129,15 @@ module TypeScript {
 >IncPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2153,15 +2153,15 @@ module TypeScript {
 >DecPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeAssertion] : IAstWalkChildren
 >                                             : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2177,15 +2177,15 @@ module TypeScript {
 >TypeAssertion : any
 >              : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren;
 >this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.FuncDecl] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2201,15 +2201,15 @@ module TypeScript {
 >FuncDecl : any
 >         : ^^^
 >ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Member] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2225,15 +2225,15 @@ module TypeScript {
 >Member : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.VarDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2249,15 +2249,15 @@ module TypeScript {
 >VarDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArgDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2273,15 +2273,15 @@ module TypeScript {
 >ArgDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren;
 >this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Return] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2297,15 +2297,15 @@ module TypeScript {
 >Return : any
 >       : ^^^
 >ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Break] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2321,15 +2321,15 @@ module TypeScript {
 >Break : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Continue] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2345,15 +2345,15 @@ module TypeScript {
 >Continue : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Throw] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2369,15 +2369,15 @@ module TypeScript {
 >Throw : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren;
 >this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                                                              : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                              : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.For] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2393,15 +2393,15 @@ module TypeScript {
 >For : any
 >    : ^^^
 >ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren;
 >this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ForIn] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2417,15 +2417,15 @@ module TypeScript {
 >ForIn : any
 >      : ^^^
 >ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren;
 >this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                                                            : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                            : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.If] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2441,15 +2441,15 @@ module TypeScript {
 >If : any
 >   : ^^^
 >ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren;
 >this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.While] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2465,15 +2465,15 @@ module TypeScript {
 >While : any
 >      : ^^^
 >ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren;
 >this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DoWhile] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2489,15 +2489,15 @@ module TypeScript {
 >DoWhile : any
 >        : ^^^
 >ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren;
 >this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Block] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2513,15 +2513,15 @@ module TypeScript {
 >Block : any
 >      : ^^^
 >ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren;
 >this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Case] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2537,15 +2537,15 @@ module TypeScript {
 >Case : any
 >     : ^^^
 >ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren;
 >this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Switch] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2561,15 +2561,15 @@ module TypeScript {
 >Switch : any
 >       : ^^^
 >ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren;
 >this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                                                     : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                     : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Try] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2585,15 +2585,15 @@ module TypeScript {
 >Try : any
 >    : ^^^
 >ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren;
 >this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryCatch] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2609,15 +2609,15 @@ module TypeScript {
 >TryCatch : any
 >         : ^^^
 >ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren;
 >this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryFinally] : IAstWalkChildren
 >                                          : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2633,15 +2633,15 @@ module TypeScript {
 >TryFinally : any
 >           : ^^^
 >ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren;
 >this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                                                             : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                             : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Finally] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2657,15 +2657,15 @@ module TypeScript {
 >Finally : any
 >        : ^^^
 >ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren;
 >this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Catch] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2681,15 +2681,15 @@ module TypeScript {
 >Catch : any
 >      : ^^^
 >ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren;
 >this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                       : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                       : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.List] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2705,15 +2705,15 @@ module TypeScript {
 >List : any
 >     : ^^^
 >ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren;
 >this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                                                           : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                           : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Script] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2729,15 +2729,15 @@ module TypeScript {
 >Script : any
 >       : ^^^
 >ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren;
 >this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                        : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                        : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ClassDeclaration] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2753,15 +2753,15 @@ module TypeScript {
 >ClassDeclaration : any
 >                 : ^^^
 >ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren;
 >this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InterfaceDeclaration] : IAstWalkChildren
 >                                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2777,15 +2777,15 @@ module TypeScript {
 >InterfaceDeclaration : any
 >                     : ^^^
 >ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren;
 >this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ModuleDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2801,15 +2801,15 @@ module TypeScript {
 >ModuleDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren;
 >this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ImportDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2825,15 +2825,15 @@ module TypeScript {
 >ImportDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren;
 >this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.With] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2849,15 +2849,15 @@ module TypeScript {
 >With : any
 >     : ^^^
 >ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren;
 >this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Label] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2873,15 +2873,15 @@ module TypeScript {
 >Label : any
 >      : ^^^
 >ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren;
 >this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                                                                               : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                                               : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LabeledStatement] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2897,15 +2897,15 @@ module TypeScript {
 >LabeledStatement : any
 >                 : ^^^
 >ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EBStart] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2921,15 +2921,15 @@ module TypeScript {
 >EBStart : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.GotoEB] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2945,15 +2945,15 @@ module TypeScript {
 >GotoEB : any
 >       : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EndCode] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2969,15 +2969,15 @@ module TypeScript {
 >EndCode : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Error] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2993,15 +2993,15 @@ module TypeScript {
 >Error : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comment] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3017,15 +3017,15 @@ module TypeScript {
 >Comment : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Debugger] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3041,11 +3041,11 @@ module TypeScript {
 >Debugger : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 
             // Verify the code is up to date with the enum
             for (var e in (<any>NodeType)._map) {
@@ -3129,7 +3129,7 @@ module TypeScript {
 
         export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3142,7 +3142,7 @@ module TypeScript {
 
         export function walkListChildren(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3224,11 +3224,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3289,11 +3289,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3313,7 +3313,7 @@ module TypeScript {
 
         export function walkUnaryExpressionChildren(preAst: UnaryExpression, parent: AST, walker: IAstWalker): void {
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : UnaryExpression
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -3341,11 +3341,11 @@ module TypeScript {
 >walker.walk(preAst.castTerm, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.castTerm : any
 >                : ^^^
 >preAst : UnaryExpression
@@ -3375,11 +3375,11 @@ module TypeScript {
 >walker.walk(preAst.operand, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand : any
 >               : ^^^
 >preAst : UnaryExpression
@@ -3393,7 +3393,7 @@ module TypeScript {
 
         export function walkBinaryExpressionChildren(preAst: BinaryExpression, parent: AST, walker: IAstWalker): void {
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : BinaryExpression
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3433,11 +3433,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3483,11 +3483,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3518,11 +3518,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3568,11 +3568,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3587,7 +3587,7 @@ module TypeScript {
 
         export function walkTypeReferenceChildren(preAst: TypeReference, parent: AST, walker: IAstWalker): void {
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeReference
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -3615,11 +3615,11 @@ module TypeScript {
 >walker.walk(preAst.term, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.term : any
 >            : ^^^
 >preAst : TypeReference
@@ -3633,7 +3633,7 @@ module TypeScript {
 
         export function walkCallExpressionChildren(preAst: CallExpression, parent: AST, walker: IAstWalker): void {
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : CallExpression
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -3667,11 +3667,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3717,11 +3717,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.arguments : any
 >                 : ^^^
 >preAst : CallExpression
@@ -3771,11 +3771,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3789,7 +3789,7 @@ module TypeScript {
 
         export function walkTrinaryExpressionChildren(preAst: ConditionalExpression, parent: AST, walker: IAstWalker): void {
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
+>                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ConditionalExpression
 >       : ^^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3817,11 +3817,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand1 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3865,11 +3865,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand2 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3913,11 +3913,11 @@ module TypeScript {
 >walker.walk(preAst.operand3, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.operand3 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3931,7 +3931,7 @@ module TypeScript {
 
         export function walkFuncDeclChildren(preAst: FuncDecl, parent: AST, walker: IAstWalker): void {
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : FuncDecl
 >       : ^^^^^^^^
 >parent : AST
@@ -3961,11 +3961,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.name : any
 >            : ^^^
 >preAst : FuncDecl
@@ -4033,11 +4033,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.arguments : any
 >                 : ^^^
 >preAst : FuncDecl
@@ -4081,11 +4081,11 @@ module TypeScript {
 >walker.walk(preAst.returnTypeAnnotation, preAst) : AST
 >                                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.returnTypeAnnotation : any
 >                            : ^^^
 >preAst : FuncDecl
@@ -4153,11 +4153,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.bod : any
 >           : ^^^
 >preAst : FuncDecl
@@ -4171,7 +4171,7 @@ module TypeScript {
 
         export function walkBoundDeclChildren(preAst: BoundDecl, parent: AST, walker: IAstWalker): void {
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : BoundDecl
 >       : ^^^^^^^^^
 >parent : AST
@@ -4201,11 +4201,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.id : any
 >          : ^^^
 >preAst : BoundDecl
@@ -4235,11 +4235,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.init : any
 >            : ^^^
 >preAst : BoundDecl
@@ -4285,11 +4285,11 @@ module TypeScript {
 >walker.walk(preAst.typeExpr, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.typeExpr : any
 >                : ^^^
 >preAst : BoundDecl
@@ -4303,7 +4303,7 @@ module TypeScript {
 
         export function walkReturnStatementChildren(preAst: ReturnStatement, parent: AST, walker: IAstWalker): void {
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ReturnStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -4331,11 +4331,11 @@ module TypeScript {
 >walker.walk(preAst.returnExpression, preAst) : AST
 >                                             : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.returnExpression : any
 >                        : ^^^
 >preAst : ReturnStatement
@@ -4349,7 +4349,7 @@ module TypeScript {
 
         export function walkForStatementChildren(preAst: ForStatement, parent: AST, walker: IAstWalker): void {
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ForStatement
 >       : ^^^^^^^^^^^^
 >parent : AST
@@ -4377,11 +4377,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.init : any
 >            : ^^^
 >preAst : ForStatement
@@ -4424,11 +4424,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : ForStatement
@@ -4471,11 +4471,11 @@ module TypeScript {
 >walker.walk(preAst.incr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.incr : any
 >            : ^^^
 >preAst : ForStatement
@@ -4518,11 +4518,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : ForStatement
@@ -4536,7 +4536,7 @@ module TypeScript {
 
         export function walkForInStatementChildren(preAst: ForInStatement, parent: AST, walker: IAstWalker): void {
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ForInStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4556,11 +4556,11 @@ module TypeScript {
 >walker.walk(preAst.lval, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.lval : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4594,11 +4594,11 @@ module TypeScript {
 >walker.walk(preAst.obj, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.obj : any
 >           : ^^^
 >preAst : ForInStatement
@@ -4642,11 +4642,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4660,7 +4660,7 @@ module TypeScript {
 
         export function walkIfStatementChildren(preAst: IfStatement, parent: AST, walker: IAstWalker): void {
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
+>                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : IfStatement
 >       : ^^^^^^^^^^^
 >parent : AST
@@ -4680,11 +4680,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : IfStatement
@@ -4728,11 +4728,11 @@ module TypeScript {
 >walker.walk(preAst.thenBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.thenBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4776,11 +4776,11 @@ module TypeScript {
 >walker.walk(preAst.elseBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.elseBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4794,7 +4794,7 @@ module TypeScript {
 
         export function walkWhileStatementChildren(preAst: WhileStatement, parent: AST, walker: IAstWalker): void {
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
+>                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : WhileStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4814,11 +4814,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4862,11 +4862,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4880,7 +4880,7 @@ module TypeScript {
 
         export function walkDoWhileStatementChildren(preAst: DoWhileStatement, parent: AST, walker: IAstWalker): void {
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : DoWhileStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -4900,11 +4900,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.cond : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4948,11 +4948,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4966,7 +4966,7 @@ module TypeScript {
 
         export function walkBlockChildren(preAst: Block, parent: AST, walker: IAstWalker): void {
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Block
 >       : ^^^^^
 >parent : AST
@@ -4996,11 +4996,11 @@ module TypeScript {
 >walker.walk(preAst.statements, preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.statements : any
 >                  : ^^^
 >preAst : Block
@@ -5014,7 +5014,7 @@ module TypeScript {
 
         export function walkCaseStatementChildren(preAst: CaseStatement, parent: AST, walker: IAstWalker): void {
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : CaseStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -5042,11 +5042,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.expr : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5091,11 +5091,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5109,7 +5109,7 @@ module TypeScript {
 
         export function walkSwitchStatementChildren(preAst: SwitchStatement, parent: AST, walker: IAstWalker): void {
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : SwitchStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5137,11 +5137,11 @@ module TypeScript {
 >walker.walk(preAst.val, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.val : any
 >           : ^^^
 >preAst : SwitchStatement
@@ -5188,11 +5188,11 @@ module TypeScript {
 >walker.walk(preAst.caseList, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.caseList : any
 >                : ^^^
 >preAst : SwitchStatement
@@ -5206,7 +5206,7 @@ module TypeScript {
 
         export function walkTryChildren(preAst: Try, parent: AST, walker: IAstWalker): void {
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
+>                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Try
 >       : ^^^
 >parent : AST
@@ -5234,11 +5234,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Try
@@ -5252,7 +5252,7 @@ module TypeScript {
 
         export function walkTryCatchChildren(preAst: TryCatch, parent: AST, walker: IAstWalker): void {
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TryCatch
 >       : ^^^^^^^^
 >parent : AST
@@ -5282,11 +5282,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryCatch
@@ -5333,11 +5333,11 @@ module TypeScript {
 >walker.walk(preAst.catchNode, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.catchNode : any
 >                 : ^^^
 >preAst : TryCatch
@@ -5351,7 +5351,7 @@ module TypeScript {
 
         export function walkTryFinallyChildren(preAst: TryFinally, parent: AST, walker: IAstWalker): void {
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TryFinally
 >       : ^^^^^^^^^^
 >parent : AST
@@ -5379,11 +5379,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryFinally
@@ -5428,11 +5428,11 @@ module TypeScript {
 >walker.walk(preAst.finallyNode, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.finallyNode : any
 >                   : ^^^
 >preAst : TryFinally
@@ -5446,7 +5446,7 @@ module TypeScript {
 
         export function walkFinallyChildren(preAst: Finally, parent: AST, walker: IAstWalker): void {
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
+>                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Finally
 >       : ^^^^^^^
 >parent : AST
@@ -5474,11 +5474,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Finally
@@ -5492,7 +5492,7 @@ module TypeScript {
 
         export function walkCatchChildren(preAst: Catch, parent: AST, walker: IAstWalker): void {
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Catch
 >       : ^^^^^
 >parent : AST
@@ -5522,11 +5522,11 @@ module TypeScript {
 >walker.walk(preAst.param, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.param : any
 >             : ^^^
 >preAst : Catch
@@ -5571,11 +5571,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : Catch
@@ -5589,7 +5589,7 @@ module TypeScript {
 
         export function walkRecordChildren(preAst: NamedDeclaration, parent: AST, walker: IAstWalker): void {
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : NamedDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5611,11 +5611,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.name : any
 >            : ^^^
 >preAst : NamedDeclaration
@@ -5659,11 +5659,11 @@ module TypeScript {
 >walker.walk(preAst.members, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.members : any
 >               : ^^^
 >preAst : NamedDeclaration
@@ -5678,7 +5678,7 @@ module TypeScript {
 
         export function walkNamedTypeChildren(preAst: TypeDeclaration, parent: AST, walker: IAstWalker): void {
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5690,7 +5690,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5701,7 +5701,7 @@ module TypeScript {
 
         export function walkClassDeclChildren(preAst: ClassDeclaration, parent: AST, walker: IAstWalker): void {
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5713,7 +5713,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5755,11 +5755,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : ClassDeclaration
@@ -5804,11 +5804,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : ClassDeclaration
@@ -5822,7 +5822,7 @@ module TypeScript {
 
         export function walkScriptChildren(preAst: Script, parent: AST, walker: IAstWalker): void {
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Script
 >       : ^^^^^^
 >parent : AST
@@ -5852,11 +5852,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.bod : any
 >           : ^^^
 >preAst : Script
@@ -5870,7 +5870,7 @@ module TypeScript {
 
         export function walkTypeDeclChildren(preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker): void {
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
+>                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5882,7 +5882,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
+>                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5925,11 +5925,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : InterfaceDeclaration
@@ -5974,11 +5974,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : InterfaceDeclaration
@@ -5992,7 +5992,7 @@ module TypeScript {
 
         export function walkModuleDeclChildren(preAst: ModuleDeclaration, parent: AST, walker: IAstWalker): void {
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6004,7 +6004,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6015,7 +6015,7 @@ module TypeScript {
 
         export function walkImportDeclChildren(preAst: ImportDeclaration, parent: AST, walker: IAstWalker): void {
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
+>                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : ImportDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6045,11 +6045,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.id : any
 >          : ^^^
 >preAst : ImportDeclaration
@@ -6079,11 +6079,11 @@ module TypeScript {
 >walker.walk(preAst.alias, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.alias : any
 >             : ^^^
 >preAst : ImportDeclaration
@@ -6097,7 +6097,7 @@ module TypeScript {
 
         export function walkWithStatementChildren(preAst: WithStatement, parent: AST, walker: IAstWalker): void {
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
+>                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : WithStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -6125,11 +6125,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.expr : any
 >            : ^^^
 >preAst : WithStatement
@@ -6172,11 +6172,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.body : any
 >            : ^^^
 >preAst : WithStatement
@@ -6190,7 +6190,7 @@ module TypeScript {
 
         export function walkLabelChildren(preAst: Label, parent: AST, walker: IAstWalker): void {
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
+>                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : Label
 >       : ^^^^^
 >parent : AST
@@ -6203,7 +6203,7 @@ module TypeScript {
 
         export function walkLabeledStatementChildren(preAst: LabeledStatement, parent: AST, walker: IAstWalker): void {
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
+>                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
 >preAst : LabeledStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6225,11 +6225,11 @@ module TypeScript {
 >walker.walk(preAst.labels, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.labels : any
 >              : ^^^
 >preAst : LabeledStatement
@@ -6263,11 +6263,11 @@ module TypeScript {
 >walker.walk(preAst.stmt, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^   ^^      ^^   ^^^^^   
+>            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^   
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >preAst.stmt : any
 >            : ^^^
 >preAst : LabeledStatement
diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types
index 90f4660a711ff..a67ca5abfadf0 100644
--- a/tests/baselines/reference/parserRealSource13.types
+++ b/tests/baselines/reference/parserRealSource13.types
@@ -15,7 +15,7 @@ module TypeScript.AstWalkerWithDetailCallback {
     export interface AstWalkerDetailCallback {
         EmptyCallback? (pre, ast: AST): boolean;
 >EmptyCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -23,7 +23,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EmptyExprCallback? (pre, ast: AST): boolean;
 >EmptyExprCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -31,7 +31,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TrueCallback? (pre, ast: AST): boolean;
 >TrueCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -39,7 +39,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FalseCallback? (pre, ast: AST): boolean;
 >FalseCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -47,7 +47,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThisCallback? (pre, ast: AST): boolean;
 >ThisCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -55,7 +55,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SuperCallback? (pre, ast: AST): boolean;
 >SuperCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -63,7 +63,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QStringCallback? (pre, ast: AST): boolean;
 >QStringCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -71,7 +71,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RegexCallback? (pre, ast: AST): boolean;
 >RegexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -79,7 +79,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NullCallback? (pre, ast: AST): boolean;
 >NullCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -87,7 +87,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArrayLitCallback? (pre, ast: AST): boolean;
 >ArrayLitCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -95,7 +95,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ObjectLitCallback? (pre, ast: AST): boolean;
 >ObjectLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -103,7 +103,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VoidCallback? (pre, ast: AST): boolean;
 >VoidCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -111,7 +111,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommaCallback? (pre, ast: AST): boolean;
 >CommaCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -119,7 +119,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         PosCallback? (pre, ast: AST): boolean;
 >PosCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -127,7 +127,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NegCallback? (pre, ast: AST): boolean;
 >NegCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -135,7 +135,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DeleteCallback? (pre, ast: AST): boolean;
 >DeleteCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -143,7 +143,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AwaitCallback? (pre, ast: AST): boolean;
 >AwaitCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -151,7 +151,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InCallback? (pre, ast: AST): boolean;
 >InCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -159,7 +159,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DotCallback? (pre, ast: AST): boolean;
 >DotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -167,7 +167,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FromCallback? (pre, ast: AST): boolean;
 >FromCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -175,7 +175,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IsCallback? (pre, ast: AST): boolean;
 >IsCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -183,7 +183,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InstOfCallback? (pre, ast: AST): boolean;
 >InstOfCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -191,7 +191,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeofCallback? (pre, ast: AST): boolean;
 >TypeofCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -199,7 +199,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NumberLitCallback? (pre, ast: AST): boolean;
 >NumberLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^   ^^^^^       
+>                  : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -207,7 +207,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NameCallback? (pre, identifierAst: Identifier): boolean;
 >NameCallback : (pre: any, identifierAst: Identifier) => boolean
->             : ^   ^^^^^^^             ^^          ^^^^^       
+>             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >identifierAst : Identifier
@@ -215,7 +215,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeRefCallback? (pre, ast: AST): boolean;
 >TypeRefCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -223,7 +223,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IndexCallback? (pre, ast: AST): boolean;
 >IndexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -231,7 +231,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CallCallback? (pre, ast: AST): boolean;
 >CallCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -239,7 +239,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NewCallback? (pre, ast: AST): boolean;
 >NewCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -247,7 +247,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgCallback? (pre, ast: AST): boolean;
 >AsgCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -255,7 +255,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAddCallback? (pre, ast: AST): boolean;
 >AsgAddCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -263,7 +263,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgSubCallback? (pre, ast: AST): boolean;
 >AsgSubCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -271,7 +271,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgDivCallback? (pre, ast: AST): boolean;
 >AsgDivCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -279,7 +279,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgMulCallback? (pre, ast: AST): boolean;
 >AsgMulCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -287,7 +287,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgModCallback? (pre, ast: AST): boolean;
 >AsgModCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -295,7 +295,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAndCallback? (pre, ast: AST): boolean;
 >AsgAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -303,7 +303,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgXorCallback? (pre, ast: AST): boolean;
 >AsgXorCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -311,7 +311,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgOrCallback? (pre, ast: AST): boolean;
 >AsgOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -319,7 +319,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgLshCallback? (pre, ast: AST): boolean;
 >AsgLshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -327,7 +327,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRshCallback? (pre, ast: AST): boolean;
 >AsgRshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -335,7 +335,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRs2Callback? (pre, ast: AST): boolean;
 >AsgRs2Callback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -343,7 +343,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QMarkCallback? (pre, ast: AST): boolean;
 >QMarkCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -351,7 +351,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogOrCallback? (pre, ast: AST): boolean;
 >LogOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -359,7 +359,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogAndCallback? (pre, ast: AST): boolean;
 >LogAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -367,7 +367,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         OrCallback? (pre, ast: AST): boolean;
 >OrCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -375,7 +375,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         XorCallback? (pre, ast: AST): boolean;
 >XorCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -383,7 +383,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AndCallback? (pre, ast: AST): boolean;
 >AndCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -391,7 +391,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqCallback? (pre, ast: AST): boolean;
 >EqCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -399,7 +399,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NeCallback? (pre, ast: AST): boolean;
 >NeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -407,7 +407,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqvCallback? (pre, ast: AST): boolean;
 >EqvCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -415,7 +415,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NEqvCallback? (pre, ast: AST): boolean;
 >NEqvCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -423,7 +423,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LtCallback? (pre, ast: AST): boolean;
 >LtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -431,7 +431,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LeCallback? (pre, ast: AST): boolean;
 >LeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -439,7 +439,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GtCallback? (pre, ast: AST): boolean;
 >GtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -447,7 +447,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GeCallback? (pre, ast: AST): boolean;
 >GeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -455,7 +455,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AddCallback? (pre, ast: AST): boolean;
 >AddCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -463,7 +463,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SubCallback? (pre, ast: AST): boolean;
 >SubCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -471,7 +471,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MulCallback? (pre, ast: AST): boolean;
 >MulCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -479,7 +479,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DivCallback? (pre, ast: AST): boolean;
 >DivCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -487,7 +487,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModCallback? (pre, ast: AST): boolean;
 >ModCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -495,7 +495,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LshCallback? (pre, ast: AST): boolean;
 >LshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -503,7 +503,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RshCallback? (pre, ast: AST): boolean;
 >RshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -511,7 +511,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         Rs2Callback? (pre, ast: AST): boolean;
 >Rs2Callback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -519,7 +519,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NotCallback? (pre, ast: AST): boolean;
 >NotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -527,7 +527,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogNotCallback? (pre, ast: AST): boolean;
 >LogNotCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -535,7 +535,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPreCallback? (pre, ast: AST): boolean;
 >IncPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -543,7 +543,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPreCallback? (pre, ast: AST): boolean;
 >DecPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -551,7 +551,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPostCallback? (pre, ast: AST): boolean;
 >IncPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -559,7 +559,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPostCallback? (pre, ast: AST): boolean;
 >DecPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -567,7 +567,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeAssertionCallback? (pre, ast: AST): boolean;
 >TypeAssertionCallback : (pre: any, ast: AST) => boolean
->                      : ^   ^^^^^^^   ^^   ^^^^^       
+>                      : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -575,7 +575,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FuncDeclCallback? (pre, funcDecl: FuncDecl): boolean;
 >FuncDeclCallback : (pre: any, funcDecl: FuncDecl) => boolean
->                 : ^   ^^^^^^^        ^^        ^^^^^       
+>                 : ^   ^^^^^^^        ^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >funcDecl : FuncDecl
@@ -583,7 +583,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MemberCallback? (pre, ast: AST): boolean;
 >MemberCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -591,7 +591,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VarDeclCallback? (pre, varDecl: VarDecl): boolean;
 >VarDeclCallback : (pre: any, varDecl: VarDecl) => boolean
->                : ^   ^^^^^^^       ^^       ^^^^^       
+>                : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >varDecl : VarDecl
@@ -599,7 +599,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArgDeclCallback? (pre, ast: AST): boolean;
 >ArgDeclCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -607,7 +607,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ReturnCallback? (pre, ast: AST): boolean;
 >ReturnCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -615,7 +615,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BreakCallback? (pre, ast: AST): boolean;
 >BreakCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -623,7 +623,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ContinueCallback? (pre, ast: AST): boolean;
 >ContinueCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -631,7 +631,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThrowCallback? (pre, ast: AST): boolean;
 >ThrowCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -639,7 +639,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForCallback? (pre, ast: AST): boolean;
 >ForCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -647,7 +647,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForInCallback? (pre, ast: AST): boolean;
 >ForInCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -655,7 +655,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IfCallback? (pre, ast: AST): boolean;
 >IfCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^   ^^^^^       
+>           : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -663,7 +663,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WhileCallback? (pre, ast: AST): boolean;
 >WhileCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -671,7 +671,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DoWhileCallback? (pre, ast: AST): boolean;
 >DoWhileCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -679,7 +679,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BlockCallback? (pre, block: Block): boolean;
 >BlockCallback : (pre: any, block: Block) => boolean
->              : ^   ^^^^^^^     ^^     ^^^^^       
+>              : ^   ^^^^^^^     ^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >block : Block
@@ -687,7 +687,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CaseCallback? (pre, ast: AST): boolean;
 >CaseCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -695,7 +695,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SwitchCallback? (pre, ast: AST): boolean;
 >SwitchCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -703,7 +703,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCallback? (pre, ast: AST): boolean;
 >TryCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^   ^^^^^       
+>            : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -711,7 +711,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCatchCallback? (pre, ast: AST): boolean;
 >TryCatchCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -719,7 +719,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryFinallyCallback? (pre, ast: AST): boolean;
 >TryFinallyCallback : (pre: any, ast: AST) => boolean
->                   : ^   ^^^^^^^   ^^   ^^^^^       
+>                   : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -727,7 +727,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FinallyCallback? (pre, ast: AST): boolean;
 >FinallyCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -735,7 +735,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CatchCallback? (pre, ast: AST): boolean;
 >CatchCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -743,7 +743,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ListCallback? (pre, astList: ASTList): boolean;
 >ListCallback : (pre: any, astList: ASTList) => boolean
->             : ^   ^^^^^^^       ^^       ^^^^^       
+>             : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >astList : ASTList
@@ -751,7 +751,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ScriptCallback? (pre, script: Script): boolean;
 >ScriptCallback : (pre: any, script: Script) => boolean
->               : ^   ^^^^^^^      ^^      ^^^^^       
+>               : ^   ^^^^^^^      ^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >script : Script
@@ -759,7 +759,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ClassDeclarationCallback? (pre, ast: AST): boolean;
 >ClassDeclarationCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -767,7 +767,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InterfaceDeclarationCallback? (pre, interfaceDecl: InterfaceDeclaration): boolean;
 >InterfaceDeclarationCallback : (pre: any, interfaceDecl: InterfaceDeclaration) => boolean
->                             : ^   ^^^^^^^             ^^                    ^^^^^       
+>                             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >interfaceDecl : InterfaceDeclaration
@@ -775,7 +775,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModuleDeclarationCallback? (pre, moduleDecl: ModuleDeclaration): boolean;
 >ModuleDeclarationCallback : (pre: any, moduleDecl: ModuleDeclaration) => boolean
->                          : ^   ^^^^^^^          ^^                 ^^^^^       
+>                          : ^   ^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >moduleDecl : ModuleDeclaration
@@ -783,7 +783,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ImportDeclarationCallback? (pre, ast: AST): boolean;
 >ImportDeclarationCallback : (pre: any, ast: AST) => boolean
->                          : ^   ^^^^^^^   ^^   ^^^^^       
+>                          : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -791,7 +791,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WithCallback? (pre, ast: AST): boolean;
 >WithCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^   ^^^^^       
+>             : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -799,7 +799,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabelCallback? (pre, labelAST: AST): boolean;
 >LabelCallback : (pre: any, labelAST: AST) => boolean
->              : ^   ^^^^^^^        ^^   ^^^^^       
+>              : ^   ^^^^^^^        ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >labelAST : AST
@@ -807,7 +807,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabeledStatementCallback? (pre, ast: AST): boolean;
 >LabeledStatementCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -815,7 +815,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EBStartCallback? (pre, ast: AST): boolean;
 >EBStartCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -823,7 +823,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GotoEBCallback? (pre, ast: AST): boolean;
 >GotoEBCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^   ^^^^^       
+>               : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -831,7 +831,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EndCodeCallback? (pre, ast: AST): boolean;
 >EndCodeCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -839,7 +839,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ErrorCallback? (pre, ast: AST): boolean;
 >ErrorCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^   ^^^^^       
+>              : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -847,7 +847,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommentCallback? (pre, ast: AST): boolean;
 >CommentCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -855,7 +855,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DebuggerCallback? (pre, ast: AST): boolean;
 >DebuggerCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^   ^^^^^       
+>                 : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -863,7 +863,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DefaultCallback? (pre, ast: AST): boolean;
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -872,7 +872,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     export function walk(script: Script, callback: AstWalkerDetailCallback): void {
 >walk : (script: Script, callback: AstWalkerDetailCallback) => void
->     : ^      ^^      ^^        ^^                       ^^^^^    
+>     : ^      ^^^^^^^^^^        ^^                       ^^^^^    
 >script : Script
 >       : ^^^^^^
 >callback : AstWalkerDetailCallback
@@ -880,9 +880,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var pre = (cur: AST, parent: AST) => {
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^   ^^      ^^   ^^^^^^^^
+>    : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >(cur: AST, parent: AST) => {            walker.options.goChildren = AstWalkerCallback(true, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^^^^^^^
+>                                                                                                                                            : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -904,7 +904,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(true, cur, callback) : boolean
 >                                       : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >true : true
 >     : ^^^^
 >cur : AST
@@ -919,9 +919,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var post = (cur: AST, parent: AST) => {
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^^^^
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >(cur: AST, parent: AST) => {            AstWalkerCallback(false, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                 : ^   ^^   ^^      ^^   ^^^^^^^^
+>                                                                                                                 : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -931,7 +931,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(false, cur, callback) : boolean
 >                                        : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >false : false
 >      : ^^^^^
 >cur : AST
@@ -962,9 +962,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 >getWalker : any
 >          : ^^^
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^   ^^      ^^   ^^^^^^^^
+>    : ^   ^^^^^^^      ^^^^^^^^^^^^^
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^   ^^      ^^   ^^^^^^^^
+>     : ^   ^^^^^^^      ^^^^^^^^^^^^^
 
         walker.walk(script, null);
 >walker.walk(script, null) : any
@@ -981,7 +981,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     function AstWalkerCallback(pre: boolean, ast: AST, callback: AstWalkerDetailCallback): boolean {
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
@@ -1047,21 +1047,21 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         if (callback.DefaultCallback) {
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 
             return callback.DefaultCallback(pre, ast);
 >callback.DefaultCallback(pre, ast) : boolean
 >                                   : ^^^^^^^
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^   ^^^^^       
+>                         : ^   ^^^^^^^   ^^^^^^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^   ^^^^^       
+>                : ^   ^^^^^^^   ^^^^^^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index 6619d911f4142..15987b2cc71ff 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -235,7 +235,7 @@ module TypeScript {
 
         public pop(): TypeScript.AST {
 >pop : () => TypeScript.AST
->    : ^^^^^^              
+>    : ^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 
@@ -304,7 +304,7 @@ module TypeScript {
 
         public push(ast: TypeScript.AST) {
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -469,7 +469,7 @@ module TypeScript {
 
         public nodeType(): TypeScript.NodeType {
 >nodeType : () => TypeScript.NodeType
->         : ^^^^^^                   
+>         : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 
@@ -623,7 +623,7 @@ module TypeScript {
 
         public get(index: number): TypeScript.AST {
 >get : (index: number) => TypeScript.AST
->    : ^     ^^      ^^^^^              
+>    : ^     ^^      ^^^^^^^^^^^^^^^^^^^
 >index : number
 >      : ^^^^^^
 >TypeScript : any
@@ -6838,7 +6838,7 @@ module TypeScript {
 
     export function isValidAstNode(ast: TypeScript.ASTSpan): boolean {
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >ast : TypeScript.ASTSpan
 >    : ^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6947,7 +6947,7 @@ module TypeScript {
     ///
     export function getAstPathToPosition(script: TypeScript.AST, pos: number, options = GetAstPathOptions.Default): TypeScript.AstPath {
 >getAstPathToPosition : (script: TypeScript.AST, pos: number, options?: GetAstPathOptions) => TypeScript.AstPath
->                     : ^      ^^              ^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
+>                     : ^      ^^^^^^^^^^^^^^^^^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7079,7 +7079,7 @@ module TypeScript {
 >ctx.path.push(comments[i]) : void
 >                           : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^              ^^^^^^^^^
+>              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7087,7 +7087,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >comments[i] : TypeScript.Comment
 >            : ^^^^^^^^^^^^^^^^^^
 >comments : TypeScript.Comment[]
@@ -7101,9 +7101,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {            if (isValidAstNode(cur)) {                // Add "cur" to the stack if it contains our position                // For "identifier" nodes, we need a special case: A position equal to "limChar" is                // valid, since the position corresponds to a caret position (in between characters)                // For example:                //  bar                //  0123                // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid                var inclusive =                    hasFlag(options, GetAstPathOptions.EdgeInclusive) ||                    cur.nodeType === TypeScript.NodeType.Name ||                    pos === script.limChar; // Special "EOF" case                var minChar = cur.minChar;                var limChar = cur.limChar + (inclusive ? 1 : 0)                if (pos >= minChar && pos < limChar) {                    // TODO: Since AST is sometimes not correct wrt to position, only add "cur" if it's better                    //       than top of the stack.                    var previous = ctx.path.ast();                    if (previous == null || (cur.minChar >= previous.minChar && cur.limChar <= previous.limChar)) {                        ctx.path.push(cur);                    }                    else {                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");                    }                }                // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually                if (pos < limChar) {                    lookInComments(cur.preComments);                }                if (pos >= minChar) {                    lookInComments(cur.postComments);                }                if (!hasFlag(options, GetAstPathOptions.DontPruneSearchBasedOnPosition)) {                    // Don't go further down the tree if pos is outside of [minChar, limChar]                    walker.options.goChildren = (minChar <= pos && pos <= limChar);                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7119,7 +7119,7 @@ module TypeScript {
 >isValidAstNode(cur) : boolean
 >                    : ^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7294,7 +7294,7 @@ module TypeScript {
 >ctx.path.push(cur) : void
 >                   : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^              ^^^^^^^^^
+>              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7302,7 +7302,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
                     }
@@ -7432,7 +7432,7 @@ module TypeScript {
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ctx : AstPathContext
 >    : ^^^^^^^^^^^^^^
 
@@ -7451,7 +7451,7 @@ module TypeScript {
     //
     export function getTokenizationOffset(script: TypeScript.Script, position: number): number {
 >getTokenizationOffset : (script: TypeScript.Script, position: number) => number
->                      : ^      ^^                 ^^        ^^      ^^^^^      
+>                      : ^      ^^^^^^^^^^^^^^^^^^^^^        ^^      ^^^^^      
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7467,9 +7467,9 @@ module TypeScript {
 
         var pre = (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >(cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {            if (TypeScript.isValidAstNode(cur)) {                // Did we find a closer offset?                if (cur.minChar <= position) {                    bestOffset = max(bestOffset, cur.minChar);                }                // Stop the walk if this node is not related to "minChar"                if (cur.minChar > position || cur.limChar < bestOffset) {                    walker.options.goChildren = false;                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7489,11 +7489,11 @@ module TypeScript {
 >TypeScript.isValidAstNode(cur) : boolean
 >                               : ^^^^^^^
 >TypeScript.isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->                          : ^   ^^                  ^^^^^       
+>                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >TypeScript : typeof TypeScript
 >           : ^^^^^^^^^^^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^                  ^^^^^       
+>               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7595,7 +7595,7 @@ module TypeScript {
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
         return bestOffset;
 >bestOffset : number
@@ -7607,13 +7607,13 @@ module TypeScript {
     ///
     export function walkAST(ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void ): void {
 >walkAST : (ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void) => void
->        : ^   ^^              ^^        ^^                                                      ^^^^^    
+>        : ^   ^^^^^^^^^^^^^^^^^^        ^^                                                      ^^^^^    
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^                     ^^^^^    
+>         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7623,9 +7623,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.push(cur);            callback(path, walker);            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                              : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                              : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7655,11 +7655,11 @@ module TypeScript {
 >path.push(cur) : void
 >               : ^^^^
 >path.push : (ast: TypeScript.AST) => void
->          : ^   ^^              ^^^^^^^^^
+>          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^              ^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7667,7 +7667,7 @@ module TypeScript {
 >callback(path, walker) : void
 >                       : ^^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^                     ^^^^^    
+>         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7679,9 +7679,9 @@ module TypeScript {
         }
         var post = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.pop();            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                       : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                       : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7711,11 +7711,11 @@ module TypeScript {
 >path.pop() : TypeScript.AST
 >           : ^^^^^^^^^^^^^^
 >path.pop : () => TypeScript.AST
->         : ^^^^^^              
+>         : ^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >pop : () => TypeScript.AST
->    : ^^^^^^              
+>    : ^^^^^^^^^^^^^^^^^^^^
 
             return cur;
 >cur : TypeScript.AST
@@ -7748,9 +7748,9 @@ module TypeScript {
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
     }
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 8f3ed1a4a4b1f..5705a96538950 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -285,7 +285,7 @@ module TypeScript {
 
     export function prePrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >prePrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>            : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -335,7 +335,7 @@ module TypeScript {
 
     export function postPrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >postPrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->             : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>             : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types
index 0ca3b7cf60791..19d355f02ffdc 100644
--- a/tests/baselines/reference/parserRealSource6.types
+++ b/tests/baselines/reference/parserRealSource6.types
@@ -66,11 +66,11 @@ module TypeScript {
 
         public scopeGetter: () => SymbolScope = null;
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 
         public objectLiteralScopeGetter: () => SymbolScope = null;
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
 
         public scopeStartAST: AST = null;
 >scopeStartAST : AST
@@ -133,32 +133,32 @@ module TypeScript {
 
         public getScope(): SymbolScope {
 >getScope : () => SymbolScope
->         : ^^^^^^           
+>         : ^^^^^^^^^^^^^^^^^
 
             return this.scopeGetter();
 >this.scopeGetter() : SymbolScope
 >                   : ^^^^^^^^^^^
 >this.scopeGetter : () => SymbolScope
->                 : ^^^^^^           
+>                 : ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
         }
 
         public getObjectLiteralScope(): SymbolScope {
 >getObjectLiteralScope : () => SymbolScope
->                      : ^^^^^^           
+>                      : ^^^^^^^^^^^^^^^^^
 
             return this.objectLiteralScopeGetter();
 >this.objectLiteralScopeGetter() : SymbolScope
 >                                : ^^^^^^^^^^^
 >this.objectLiteralScopeGetter : () => SymbolScope
->                              : ^^^^^^           
+>                              : ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
         }
 
         public getScopeAST() {
@@ -193,7 +193,7 @@ module TypeScript {
 
         public getScriptFragmentStartAST(): AST {
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 
             return this.scopeStartAST;
 >this.scopeStartAST : AST
@@ -214,18 +214,18 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^   
+>                               : ^^^^^^^^^
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 >minChar : any
 >        : ^^^
         }
 
         public getScriptFragment(): Script {
 >getScriptFragment : () => Script
->                  : ^^^^^^      
+>                  : ^^^^^^^^^^^^
 
             if (this.scriptFragment == null) {
 >this.scriptFragment == null : boolean
@@ -243,11 +243,11 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^   
+>                               : ^^^^^^^^^
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^   
+>                          : ^^^^^^^^^
 
                 var minChar = ast.minChar;
 >minChar : any
@@ -341,7 +341,7 @@ module TypeScript {
 
     export function preFindMemberScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindMemberScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                   : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                   : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -508,7 +508,7 @@ module TypeScript {
 
     export function pushTypeCollectionScope(container: Symbol,
 >pushTypeCollectionScope : (container: Symbol, valueMembers: ScopedMembers, ambientValueMembers: ScopedMembers, enclosedTypes: ScopedMembers, ambientEnclosedTypes: ScopedMembers, context: TypeCollectionContext, thisType: Type, classType: Type, moduleDecl: ModuleDeclaration) => void
->                        : ^         ^^      ^^            ^^             ^^                   ^^             ^^             ^^             ^^                    ^^             ^^       ^^                     ^^        ^^    ^^         ^^    ^^          ^^                 ^^^^^^^^^
+>                        : ^         ^^      ^^            ^^^^^^^^^^^^^^^^^                   ^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^                    ^^^^^^^^^^^^^^^^^       ^^                     ^^        ^^^^^^^^         ^^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 
@@ -658,7 +658,7 @@ module TypeScript {
 
     export function preFindEnclosingScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -796,11 +796,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                         : ^^^^^^^^^
 
@@ -853,11 +853,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                     : ^^^^^^^^^
 
@@ -965,11 +965,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                                                    : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                              : ^^^^^^^^^
 
@@ -990,11 +990,11 @@ module TypeScript {
 >context.objectLiteralScopeGetter = function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                                                              : ^^^^^^^^^
 >context.objectLiteralScopeGetter : () => SymbolScope
->                                 : ^^^^^^           
+>                                 : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^           
+>                         : ^^^^^^^^^^^^^^^^^
 >function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                           : ^^^^^^^^^
 
@@ -1050,11 +1050,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                     : ^^^^^^^^^
 
@@ -1107,11 +1107,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                             : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                       : ^^^^^^^^^
 
@@ -1195,11 +1195,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^           
+>                    : ^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^           
+>            : ^^^^^^^^^^^^^^^^^
 >function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         : ^^^^^^^^^
 
@@ -1371,7 +1371,7 @@ module TypeScript {
     //
     export function findEnclosingScopeAt(logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean): EnclosingScopeContext {
 >findEnclosingScopeAt : (logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean) => EnclosingScopeContext
->                     : ^      ^^       ^^      ^^      ^^    ^^           ^^   ^^      ^^                  ^^       ^^^^^                     
+>                     : ^      ^^^^^^^^^^^      ^^^^^^^^^^    ^^^^^^^^^^^^^^^   ^^      ^^                  ^^       ^^^^^                     
 >logger : ILogger
 >       : ^^^^^^^
 >script : Script
@@ -1419,7 +1419,7 @@ module TypeScript {
 >script : Script
 >       : ^^^^^^
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index 8b2d40b9c40ca..ac67b62fabd65 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -29,7 +29,7 @@ module TypeScript {
 
     function getBaseTypeLinks(bases: ASTList, baseTypeLinks: TypeLink[]) {
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >bases : ASTList
 >      : ^^^^^^^
 >baseTypeLinks : TypeLink[]
@@ -153,7 +153,7 @@ module TypeScript {
 
     function getBases(type: Type, typeDecl: TypeDeclaration) {
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >type : Type
 >     : ^^^^
 >typeDecl : TypeDeclaration
@@ -171,7 +171,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks) : TypeLink[]
 >                                                              : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.extendsList : any
 >                     : ^^^
 >typeDecl : TypeDeclaration
@@ -197,7 +197,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.implementsList, type.implementsTypeLinks) : TypeLink[]
 >                                                                    : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.implementsList : any
 >                        : ^^^
 >typeDecl : TypeDeclaration
@@ -214,7 +214,7 @@ module TypeScript {
 
     function addPrototypeField(classType: Type, ast: AST, context: TypeCollectionContext) {
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
+>                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >ast : AST
@@ -389,7 +389,7 @@ module TypeScript {
 
     export function createNewConstructGroupForType(type: Type) {
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >type : Type
 >     : ^^^^
 
@@ -480,7 +480,7 @@ module TypeScript {
 
     export function cloneParentConstructGroupForChildType(child: Type, parent: Type) {
 >cloneParentConstructGroupForChildType : (child: Type, parent: Type) => void
->                                      : ^     ^^    ^^      ^^    ^^^^^^^^^
+>                                      : ^     ^^^^^^^^      ^^^^^^^^^^^^^^^
 >child : Type
 >      : ^^^^
 >parent : Type
@@ -518,7 +518,7 @@ module TypeScript {
 >createNewConstructGroupForType(parent) : void
 >                                       : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >parent : Type
 >       : ^^^^
         }
@@ -748,7 +748,7 @@ module TypeScript {
 
     function findTypeSymbolInScopeChain(name: string, scopeChain: ScopeChain): Symbol {
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain : ScopeChain
@@ -798,7 +798,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, scopeChain.previous) : Symbol
 >                                                      : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain.previous : any
@@ -816,7 +816,7 @@ module TypeScript {
 
     function findSymbolFromAlias(alias: AST, context: IAliasScopeContext): Symbol {
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >alias : AST
 >      : ^^^
 >context : IAliasScopeContext
@@ -903,7 +903,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, context.topLevelScope) : Symbol
 >                                                        : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^          ^^^^^      
+>                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
 >name : any
 >     : ^^^
 >context.topLevelScope : ScopeChain
@@ -1001,7 +1001,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand1, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >dottedExpr.operand1 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1033,7 +1033,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand2, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >dottedExpr.operand2 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1110,7 +1110,7 @@ module TypeScript {
 
     export function preCollectImportTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -1171,7 +1171,7 @@ module TypeScript {
 >findSymbolFromAlias(importDecl.alias, { topLevelScope: scopeChain, members: null, tcContext: context }) : Symbol
 >                                                                                                        : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^   ^^       ^^                  ^^^^^      
+>                    : ^     ^^^^^^^       ^^                  ^^^^^      
 >importDecl.alias : any
 >                 : ^^^
 >importDecl : ImportDeclaration
@@ -1464,7 +1464,7 @@ module TypeScript {
 
     export function preCollectModuleTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -2586,7 +2586,7 @@ module TypeScript {
 
     export function preCollectClassTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3140,7 +3140,7 @@ module TypeScript {
 >addPrototypeField(classType, classDecl, context) : void
 >                                                 : ^^^^
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
+>                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >classDecl : ClassDeclaration
@@ -3806,7 +3806,7 @@ module TypeScript {
 >createNewConstructGroupForType(classDecl.type) : void
 >                                               : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^    ^^^^^^^^^
+>                               : ^    ^^^^^^^^^^^^^^^
 >classDecl.type : any
 >               : ^^^
 >classDecl : ClassDeclaration
@@ -3851,7 +3851,7 @@ module TypeScript {
 >getBases(instanceType, classDecl) : void
 >                                  : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >instanceType : Type
 >             : ^^^^
 >classDecl : ClassDeclaration
@@ -3892,7 +3892,7 @@ module TypeScript {
 
     export function preCollectInterfaceTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4244,7 +4244,7 @@ module TypeScript {
 >getBases(interfaceType, interfaceDecl) : void
 >                                       : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^    ^^        ^^               ^^^^^^^^^
+>         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >interfaceType : Type
 >              : ^^^^
 >interfaceDecl : InterfaceDeclaration
@@ -4393,7 +4393,7 @@ module TypeScript {
 
     export function preCollectArgDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4696,7 +4696,7 @@ module TypeScript {
 
     export function preCollectVarDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -5568,7 +5568,7 @@ module TypeScript {
 
     export function preCollectFuncDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7455,7 +7455,7 @@ module TypeScript {
 
     export function preCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >preCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7581,7 +7581,7 @@ module TypeScript {
 >preCollectImportTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7637,7 +7637,7 @@ module TypeScript {
 >preCollectModuleTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7669,7 +7669,7 @@ module TypeScript {
 >preCollectClassTypes(ast, parent, context) : boolean
 >                                           : ^^^^^^^
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7725,7 +7725,7 @@ module TypeScript {
 >preCollectInterfaceTypes(ast, parent, context) : boolean
 >                                               : ^^^^^^^
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7759,7 +7759,7 @@ module TypeScript {
 >preCollectArgDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7791,7 +7791,7 @@ module TypeScript {
 >preCollectVarDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7823,7 +7823,7 @@ module TypeScript {
 >preCollectFuncDeclTypes(ast, parent, context) : boolean
 >                                              : ^^^^^^^
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
+>                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7896,7 +7896,7 @@ module TypeScript {
 
     export function postCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >postCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types
index 011cf47ae9f94..d5273187496c0 100644
--- a/tests/baselines/reference/parserRealSource8.types
+++ b/tests/baselines/reference/parserRealSource8.types
@@ -30,7 +30,7 @@ module TypeScript {
 
     export function pushAssignScope(scope: SymbolScope,
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 
@@ -317,7 +317,7 @@ module TypeScript {
 
     export function preAssignModuleScopes(ast: AST, context: AssignScopeContext) {
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -540,7 +540,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -614,7 +614,7 @@ module TypeScript {
 
     export function preAssignClassScopes(ast: AST, context: AssignScopeContext) {
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -887,7 +887,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, instanceType, classType, null) : void
 >                                                                  : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -934,7 +934,7 @@ module TypeScript {
 
     export function preAssignInterfaceScopes(ast: AST, context: AssignScopeContext) {
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1097,7 +1097,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -1118,7 +1118,7 @@ module TypeScript {
 
     export function preAssignWithScopes(ast: AST, context: AssignScopeContext) {
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1326,7 +1326,7 @@ module TypeScript {
 >pushAssignScope(withScope, context, null, null, null) : void
 >                                                      : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >withScope : any
 >          : ^^^
 >context : AssignScopeContext
@@ -1347,7 +1347,7 @@ module TypeScript {
 
     export function preAssignFuncDeclScopes(ast: AST, context: AssignScopeContext) {
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3274,7 +3274,7 @@ module TypeScript {
 >pushAssignScope(locals, context, thisType, null, funcDecl) : void
 >                                                           : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >locals : any
 >       : ^^^
 >context : AssignScopeContext
@@ -3288,7 +3288,7 @@ module TypeScript {
 
     export function preAssignCatchScopes(ast: AST, context: AssignScopeContext) {
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3382,7 +3382,7 @@ module TypeScript {
 >pushAssignScope(catchLocals, context, context.scopeChain.thisType, context.scopeChain.classType, context.scopeChain.fnc) : void
 >                                                                                                                         : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
 >catchLocals : any
 >            : ^^^
 >context : AssignScopeContext
@@ -3422,7 +3422,7 @@ module TypeScript {
 
     export function preAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >preAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3514,7 +3514,7 @@ module TypeScript {
 >preAssignModuleScopes(ast, context) : void
 >                                    : ^^^^
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3540,7 +3540,7 @@ module TypeScript {
 >preAssignClassScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3566,7 +3566,7 @@ module TypeScript {
 >preAssignInterfaceScopes(ast, context) : void
 >                                       : ^^^^
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3592,7 +3592,7 @@ module TypeScript {
 >preAssignWithScopes(ast, context) : void
 >                                  : ^^^^
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3618,7 +3618,7 @@ module TypeScript {
 >preAssignFuncDeclScopes(ast, context) : void
 >                                      : ^^^^
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3644,7 +3644,7 @@ module TypeScript {
 >preAssignCatchScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3698,7 +3698,7 @@ module TypeScript {
 
     export function postAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >postAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
+>                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index ab395310ba98b..cde69fbfba44a 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -20,7 +20,7 @@ module TypeScript {
 
         public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) {
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >typeLinks : TypeLink[]
 >          : ^^^^^^^^^^
 >scope : SymbolScope
@@ -194,7 +194,7 @@ module TypeScript {
 
         public resolveBases(scope: SymbolScope, type: Type) {
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^           ^^    ^^    ^^^^^^^^^
+>             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -212,11 +212,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.extendsTypeLinks, scope) : Type[]
 >                                                        : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >type.extendsTypeLinks : any
 >                      : ^^^
 >type : Type
@@ -452,11 +452,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.implementsTypeLinks, scope) : Type[]
 >                                                           : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
 >type.implementsTypeLinks : any
 >                         : ^^^
 >type : Type
@@ -589,7 +589,7 @@ module TypeScript {
 
         public resolveSignatureGroup(signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) {
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >signatureGroup : SignatureGroup
 >               : ^^^^^^^^^^^^^^
 >scope : SymbolScope
@@ -732,11 +732,11 @@ module TypeScript {
 >this.bindSymbol(scope, signature.parameters[j]) : void
 >                                                : ^^^^
 >this.bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->                : ^     ^^           ^^      ^^      ^^^^^^^^^
+>                : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^           ^^      ^^      ^^^^^^^^^
+>           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >signature.parameters[j] : any
@@ -887,7 +887,7 @@ module TypeScript {
 
         public bindType(scope: SymbolScope, type: Type, instanceType: Type): void {
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -903,11 +903,11 @@ module TypeScript {
 >this.bindType(scope, instanceType, null) : void
 >                                         : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >instanceType : Type
@@ -1115,11 +1115,11 @@ module TypeScript {
 >this.bind(agg, type.members.allMembers) : void
 >                                        : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >type.members.allMembers : any
@@ -1141,11 +1141,11 @@ module TypeScript {
 >this.bind(agg, typeMembers.allMembers) : void
 >                                       : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >typeMembers.allMembers : any
@@ -1163,11 +1163,11 @@ module TypeScript {
 >this.bind(agg, ambientMembers.allMembers) : void
 >                                          : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientMembers.allMembers : any
@@ -1185,11 +1185,11 @@ module TypeScript {
 >this.bind(agg, ambientTypeMembers.allMembers) : void
 >                                              : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^           ^^     ^^          ^^^^^^^^^
+>          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientTypeMembers.allMembers : any
@@ -1243,11 +1243,11 @@ module TypeScript {
 >this.resolveBases(scope, type) : void
 >                               : ^^^^
 >this.resolveBases : (scope: SymbolScope, type: Type) => void
->                  : ^     ^^           ^^    ^^    ^^^^^^^^^
+>                  : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^           ^^    ^^    ^^^^^^^^^
+>             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -1265,11 +1265,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.construct, scope, instanceType) : void
 >                                                                : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.construct : any
 >               : ^^^
 >type : Type
@@ -1293,11 +1293,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.call, scope, null) : void
 >                                                   : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.call : any
 >          : ^^^
 >type : Type
@@ -1319,11 +1319,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.index, scope, null) : void
 >                                                    : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
+>                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
 >type.index : any
 >           : ^^^
 >type : Type
@@ -1345,11 +1345,11 @@ module TypeScript {
 >this.bindType(scope, type.elementType, null) : void
 >                                             : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type.elementType : any
@@ -1363,7 +1363,7 @@ module TypeScript {
 
         public bindSymbol(scope: SymbolScope, symbol: Symbol) {
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^           ^^      ^^      ^^^^^^^^^
+>           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >symbol : Symbol
@@ -1715,11 +1715,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.type, typeSymbol.instanceType) : void
 >                                                               : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.type : any
@@ -1778,11 +1778,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.expansions[i], typeSymbol.instanceType) : void
 >                                                                        : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
+>         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.expansions[i] : any
@@ -1925,7 +1925,7 @@ module TypeScript {
 
         public bind(scope: SymbolScope, table: IHashTable) {
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^           ^^     ^^          ^^^^^^^^^
+>     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >table : IHashTable
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.types b/tests/baselines/reference/parserUnterminatedGeneric1.types
index 549ca935c184d..12c025090c4b2 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.types
@@ -4,7 +4,7 @@
  interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^        
+>    : ^        ^^               ^^^^^^^^^^^^^
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types
index b947eed9d1388..2f5be1ab9ff4c 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.types
@@ -39,7 +39,7 @@ declare module ng {
     interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^        
+>    : ^        ^^               ^^^^^^^^^^^^^
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.types b/tests/baselines/reference/parserX_ArrowFunction1.types
index b81026b7751d5..9231ec5c45df6 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.types
+++ b/tests/baselines/reference/parserX_ArrowFunction1.types
@@ -3,9 +3,9 @@
 === parserX_ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^   ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^   ^^^^^^^^^
+>               : ^ ^^^^^^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index 0326d8453ba19..2828e5164aaf3 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -4320,7 +4320,7 @@ module Harness {
             /** create file gets the whole path to create, so this works as expected with the --out parameter */
             public createFile(s: string, useUTF8?: boolean): ITextWriter {
 >createFile : (s: string, useUTF8?: boolean) => ITextWriter
->           : ^ ^^      ^^       ^^^       ^^^^^           
+>           : ^ ^^      ^^       ^^^       ^^^^^^^^^^^^^^^^
 >s : string
 >  : ^^^^^^
 >useUTF8 : boolean
@@ -4687,7 +4687,7 @@ module Harness {
 
         export function makeDefaultCompilerForTest(c?: TypeScript.TypeScriptCompiler) {
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^                             ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >c : TypeScript.TypeScriptCompiler
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6448,11 +6448,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^              ^^^^^^^^^^^
+>                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6602,11 +6602,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^              ^^^^^^^^^^^
+>                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6816,7 +6816,7 @@ module Harness {
 
             private getTypeInfoName(ast : TypeScript.AST) {
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^              ^^^^^^^^^^^
+>                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8329,7 +8329,7 @@ module Harness {
 >makeDefaultCompilerForTest() : any
 >                             : ^^^
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^                             ^^^^^^^^
+>                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
             if (usePull) {
 >usePull : boolean
@@ -8733,7 +8733,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8797,7 +8797,7 @@ module Harness {
 >callback : (res: CompilerResult) => void
 >         : ^   ^^              ^^^^^    
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >context : CompilationContext
 >        : ^^^^^^^^^^^^^^^^^^
 >references : TypeScript.IFileReference[]
@@ -8816,7 +8816,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8931,13 +8931,13 @@ module Harness {
 
             if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 
                 settingsCallback(compiler.settings);
 >settingsCallback(compiler.settings) : void
 >                                    : ^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 >compiler.settings : any
 >                  : ^^^
 >compiler : TypeScript.TypeScriptCompiler
@@ -8991,7 +8991,7 @@ module Harness {
                 // So that a test doesn't have side effects for tests run after it, restore the compiler settings to their previous state.
                 if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^                              ^^^^^    
+>                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
 
                     compiler.settings = oldCompilerSettings;
 >compiler.settings = oldCompilerSettings : any
@@ -9184,7 +9184,7 @@ module Harness {
 
         export function emit(ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) {
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >ioHost : TypeScript.EmitterIOHost
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -9360,7 +9360,7 @@ module Harness {
 >emit(stdout, true) : void
 >                   : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >true : true
@@ -9383,7 +9383,7 @@ module Harness {
 >emit(stdout, false) : void
 >                    : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
+>     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >false : false
@@ -10326,7 +10326,7 @@ module Harness {
 
         public editRanges: { length: number; editRange: TypeScript.ScriptEditRange; }[] = [];
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >editRange : TypeScript.ScriptEditRange
@@ -10371,11 +10371,11 @@ module Harness {
 >this.editRanges = [] : undefined[]
 >                     : ^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -10494,15 +10494,15 @@ module Harness {
 >this.editRanges.push({                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            }) : number
 >                                                                                                                                                                                                  : ^^^^^^
 >this.editRanges.push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
+>                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
+>     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >{                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            } : { length: number; editRange: any; }
 >                                                                                                                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -10560,11 +10560,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >this.maxScriptVersions : number
@@ -10576,17 +10576,17 @@ module Harness {
 
                 this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length);
 >this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
+>                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
+>       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
 >this.maxScriptVersions - this.editRanges.length : number
@@ -10600,11 +10600,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
             }
@@ -10623,7 +10623,7 @@ module Harness {
 
         public getEditRangeSinceVersion(version: number): TypeScript.ScriptEditRange {
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^                          
+>                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >version : number
 >        : ^^^^^^
 >TypeScript : any
@@ -10653,11 +10653,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >(this.version - version) : number
@@ -10689,11 +10689,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -10715,19 +10715,19 @@ module Harness {
 
             var entries = this.editRanges.slice(initialEditRangeIndex);
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.slice(initialEditRangeIndex) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges.slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >initialEditRangeIndex : number
 >                      : ^^^^^^
 
@@ -10741,21 +10741,21 @@ module Harness {
 >entries.map(x => x.editRange.minChar) : any[]
 >                                      : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.minChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
+>                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.editRange.minChar : any
 >                    : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -10791,21 +10791,21 @@ module Harness {
 >entries.map(x => x.length - x.editRange.limChar) : number[]
 >                                                 : ^^^^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.length - x.editRange.limChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => number
->                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^
+>                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.length - x.editRange.limChar : number
 >                               : ^^^^^^
 >x.length : number
 >         : ^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >length : number
 >       : ^^^^^^
 >x.editRange.limChar : any
@@ -10813,7 +10813,7 @@ module Harness {
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >limChar : any
@@ -10849,21 +10849,21 @@ module Harness {
 >entries.map(x => x.editRange.delta) : any[]
 >                                    : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.delta : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
+>                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x.editRange.delta : any
 >                  : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >delta : any
@@ -10899,9 +10899,9 @@ module Harness {
 >entries[0].length : number
 >                  : ^^^^^^
 >entries[0] : { length: number; editRange: TypeScript.ScriptEditRange; }
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >0 : 0
 >  : ^
 >length : number
@@ -11495,7 +11495,7 @@ module Harness {
 >this.scripts[scriptIndex].getEditRangeSinceVersion(scriptVersion) : TypeScript.ScriptEditRange
 >                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex].getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                                                   : ^       ^^      ^^^^^                          
+>                                                   : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex] : ScriptInfo
 >                          : ^^^^^^^^^^
 >this.scripts : ScriptInfo[]
@@ -11507,7 +11507,7 @@ module Harness {
 >scriptIndex : number
 >            : ^^^^^^
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^                          
+>                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >scriptVersion : number
 >              : ^^^^^^
 
@@ -11557,7 +11557,7 @@ module Harness {
          */
         public getLanguageService(): Services.ILanguageServiceShim {
 >getLanguageService : () => Services.ILanguageServiceShim
->                   : ^^^^^^                             
+>                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >Services : any
 >         : ^^^
 
@@ -11613,7 +11613,7 @@ module Harness {
         /** Parse file given its source text */
         public parseSourceText(fileName: string, sourceText: TypeScript.ISourceText): TypeScript.Script {
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^                      ^^^^^                 
+>                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >sourceText : TypeScript.ISourceText
@@ -11721,11 +11721,11 @@ module Harness {
 >this.parseSourceText(fileName, sourceText) : TypeScript.Script
 >                                           : ^^^^^^^^^^^^^^^^^
 >this.parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                     : ^        ^^      ^^          ^^                      ^^^^^                 
+>                     : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^                      ^^^^^                 
+>                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >sourceText : any
@@ -11871,7 +11871,7 @@ module Harness {
         */
         public positionToZeroBasedLineCol(fileName: string, position: number): TypeScript.ILineCol {
 >positionToZeroBasedLineCol : (fileName: string, position: number) => TypeScript.ILineCol
->                           : ^        ^^      ^^        ^^      ^^^^^                   
+>                           : ^        ^^      ^^        ^^      ^^^^^^^^^^^^^^^^^^^^^^^^
 >fileName : string
 >         : ^^^^^^
 >position : number
@@ -12279,25 +12279,25 @@ module Harness {
 
             var temp = mapEdits(edits).sort(function (a, b) {
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort(function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            }) : { edit: Services.TextEdit; index: number; }[]
->                                                                                                                                                                                                                               : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                                                                                                                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->                     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits(edits) : { edit: Services.TextEdit; index: number; }[]
->                : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >mapEdits : (edits: Services.TextEdit[]) => { edit: Services.TextEdit; index: number; }[]
 >         : ^     ^^                   ^^^^^                                             
 >edits : Services.TextEdit[]
 >      : ^^^^^^^^^^^^^^^^^^^
 >sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            } : (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number
->                                                                                                                                                                                                         : ^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^^^^^^^
+>                                                                                                                                                                                                         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 
                 var result = a.edit.minChar - b.edit.minChar;
 >result : number
@@ -12309,7 +12309,7 @@ module Harness {
 >a.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12319,7 +12319,7 @@ module Harness {
 >b.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12343,13 +12343,13 @@ module Harness {
 >a.index : number
 >        : ^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 >b.index : number
 >        : ^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 
@@ -12379,7 +12379,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12389,9 +12389,9 @@ module Harness {
 >temp[current].edit : Services.TextEdit
 >                   : ^^^^^^^^^^^^^^^^^
 >temp[current] : { edit: Services.TextEdit; index: number; }
->              : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >current : number
 >        : ^^^^^^
 >edit : Services.TextEdit
@@ -12406,7 +12406,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12436,9 +12436,9 @@ module Harness {
 >temp[next].edit : Services.TextEdit
 >                : ^^^^^^^^^^^^^^^^^
 >temp[next] : { edit: Services.TextEdit; index: number; }
->           : ^^^^^^^^                 ^^^^^^^^^      ^^^
+>           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
 >next : number
 >     : ^^^^^^
 >edit : Services.TextEdit
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index 0d93f460d18e4..773edd88ec266 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -145,11 +145,11 @@ module Formatting {
 >this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree) : void
 >                                                                          : ^^^^
 >this.ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                                 : ^                       ^^      ^^    ^^         ^^^^^    
+>                                 : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^         ^^^^^    
+>                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >this.languageHostIndentation : string
 >                             : ^^^^^^
 >this : this
@@ -167,11 +167,11 @@ module Formatting {
 >this.FillInheritedIndentation(this.tree) : void
 >                                         : ^^^^
 >this.FillInheritedIndentation : (tree: ParseTree) => void
->                              : ^    ^^         ^^^^^    
+>                              : ^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^         ^^^^^    
+>                         : ^    ^^^^^^^^^^^^^^^^    
 >this.tree : ParseTree
 >          : ^^^^^^^^^
 >this : this
@@ -183,7 +183,7 @@ module Formatting {
 
         public GetIndentationEdits(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEdits : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                    : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                    : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -332,11 +332,11 @@ module Formatting {
 >this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent) : List_TextEditInfo
 >                                                                       : ^^^^^^^^^^^^^^^^^
 >this.GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                               : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                               : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -477,7 +477,7 @@ module Formatting {
 
         public GetIndentationEditsWorker(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
+>                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -513,11 +513,11 @@ module Formatting {
 >this.AdjustStartOffsetIfNeeded(token, node) : void
 >                                            : ^^^^
 >this.AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                               : ^     ^^         ^^    ^^         ^^^^^    
+>                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >this : this
 >     : ^^^^
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^         ^^    ^^         ^^^^^    
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -558,11 +558,11 @@ module Formatting {
 >this.IsMultiLineString(token) : boolean
 >                              : ^^^^^^^
 >this.IsMultiLineString : (token: TokenSpan) => boolean
->                       : ^     ^^         ^^^^^       
+>                       : ^     ^^^^^^^^^^^^^^^^       
 >this : this
 >     : ^^^^
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^         ^^^^^       
+>                  : ^     ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -580,11 +580,11 @@ module Formatting {
 >this.GetSpecialCaseIndentation(token, node) : IndentationInfo
 >                                            : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                               : ^     ^^         ^^    ^^         ^^^^^               
+>                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^         ^^    ^^         ^^^^^               
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -811,11 +811,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^         ^^    ^^         ^^^^^               
+>                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -837,11 +837,11 @@ module Formatting {
 >this.GetIndentEdit(indentationInfo, token.Span.startPosition(), sameLineIndent) : TextEditInfo
 >                                                                                : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >indentationInfo : IndentationInfo
 >                : ^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
@@ -869,11 +869,11 @@ module Formatting {
 >this.RegisterIndentation(edit, sameLineIndent) : void
 >                                               : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^            ^^              ^^       ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >edit : TextEditInfo
 >     : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -914,11 +914,11 @@ module Formatting {
 >this.GetCommentIndentationEdits(token) : List_TextEditInfo
 >                                       : ^^^^^^^^^^^^^^^^^
 >this.GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                                : ^     ^^         ^^^^^                 
+>                                : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^         ^^^^^                 
+>                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -960,7 +960,7 @@ module Formatting {
 
         private GetCommentIndentationEdits(token: TokenSpan): List_TextEditInfo {
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^         ^^^^^                 
+>                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -1140,11 +1140,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(lineIndent, commentFirstLineIndentationDelta) : IndentationInfo
 >                                                                          : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^               
+>                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >lineIndent : string
 >           : ^^^^^^
 >commentFirstLineIndentationDelta : number
@@ -1176,11 +1176,11 @@ module Formatting {
 >this.GetIndentEdit(commentIndentationInfo, tokenStartPosition, false) : TextEditInfo
 >                                                                      : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >commentIndentationInfo : IndentationInfo
 >                       : ^^^^^^^^^^^^^^^
 >tokenStartPosition : any
@@ -1217,7 +1217,7 @@ module Formatting {
 
         static GetIndentSizeFromIndentText(indentText: string, editorOptions: Services.EditorOptions): number {
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >indentText : string
 >           : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1240,7 +1240,7 @@ module Formatting {
 
         static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number {
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >text : string
 >     : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1371,7 +1371,7 @@ module Formatting {
 
         private GetSpecialCaseIndentation(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^         ^^    ^^         ^^^^^               
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1405,11 +1405,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForLCurly(node) : IndentationInfo
 >                                              : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                        : ^    ^^         ^^^^^               
+>                                        : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^         ^^^^^               
+>                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1605,11 +1605,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForSemicolon(token, node) : IndentationInfo
 >                                                        : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                           : ^     ^^         ^^    ^^         ^^^^^               
+>                                           : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^         ^^    ^^         ^^^^^               
+>                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1627,11 +1627,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForComment(token, node) : IndentationInfo
 >                                                      : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                         : ^     ^^         ^^    ^^         ^^^^^               
+>                                         : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^         ^^    ^^         ^^^^^               
+>                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1646,7 +1646,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForLCurly(node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^         ^^^^^               
+>                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1805,7 +1805,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForSemicolon(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^         ^^    ^^         ^^^^^               
+>                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1941,7 +1941,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForComment(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^         ^^    ^^         ^^^^^               
+>                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2058,11 +2058,11 @@ module Formatting {
 >this.CanIndentComment(token, node) : boolean
 >                                   : ^^^^^^^
 >this.CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                      : ^     ^^         ^^    ^^         ^^^^^       
+>                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >this : this
 >     : ^^^^
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^         ^^    ^^         ^^^^^       
+>                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2093,11 +2093,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^         ^^    ^^         ^^^^^               
+>                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2112,7 +2112,7 @@ module Formatting {
 
         private CanIndentComment(token: TokenSpan, node: ParseNode): boolean {
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^         ^^    ^^         ^^^^^       
+>                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2339,7 +2339,7 @@ module Formatting {
 
         private ApplyScriptBlockIndentation(languageHostIndentation: string, tree: ParseTree): void
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^         ^^^^^    
+>                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
 >languageHostIndentation : string
 >                        : ^^^^^^
 >tree : ParseTree
@@ -2441,7 +2441,7 @@ module Formatting {
 
         private GetIndentEdit(indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean): TextEditInfo {
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
+>              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
 >indentInfo : IndentationInfo
 >           : ^^^^^^^^^^^^^^^
 >tokenStartPosition : number
@@ -3005,7 +3005,7 @@ module Formatting {
 
         private  ApplyIndentationDeltaFromParent(token: TokenSpan, node: ParseNode): IndentationInfo {
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^         ^^    ^^         ^^^^^               
+>                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -3135,11 +3135,11 @@ module Formatting {
 >this.ApplyIndentationDelta1(token.Span.startPosition(), parentIndentationDeltaSize) : IndentationInfo
 >                                                                                    : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                            : ^                  ^^      ^^     ^^      ^^^^^               
+>                            : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^               
+>                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
 >                           : ^^^
 >token.Span.startPosition : any
@@ -3164,7 +3164,7 @@ module Formatting {
 
         private ApplyIndentationDelta1(tokenStartPosition: number, delta: number): IndentationInfo {
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^               
+>                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >tokenStartPosition : number
 >                   : ^^^^^^
 >delta : number
@@ -3240,11 +3240,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(currentIndent, delta) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^               
+>                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >currentIndent : any
 >              : ^^^
 >delta : number
@@ -3253,7 +3253,7 @@ module Formatting {
 
         private ApplyIndentationDelta2(currentIndent: string, delta: number): IndentationInfo {
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^               
+>                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
 >currentIndent : string
 >              : ^^^^^^
 >delta : number
@@ -3275,11 +3275,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(currentIndent, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >currentIndent : string
 >              : ^^^^^^
 >this.editorOptions : Services.EditorOptions
@@ -3499,11 +3499,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromText(origIndentText, this.editorOptions, /*includeNonIndentChars*/true) : number
 >                                                                                                  : ^^^^^^
 >Indenter.GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                               : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                               : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3521,11 +3521,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(newIndentText, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >newIndentText : any
 >              : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3613,11 +3613,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(childIndentText, this.editorOptions) : number
 >                                                                          : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >childIndentText : any
 >                : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3643,11 +3643,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(origIndentText, this.editorOptions) : number
 >                                                                         : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^                      ^^^^^      
+>                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^                      ^^^^^      
+>                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3696,7 +3696,7 @@ module Formatting {
 
         private FillInheritedIndentation(tree: ParseTree): void
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^         ^^^^^    
+>                         : ^    ^^^^^^^^^^^^^^^^    
 >tree : ParseTree
 >     : ^^^^^^^^^
         {
@@ -4642,7 +4642,7 @@ module Formatting {
 
         private RegisterIndentation(indent: TextEditInfo, sameLineIndent: boolean): void
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >indent : TextEditInfo
 >       : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -4772,11 +4772,11 @@ module Formatting {
 >this.RegisterIndentation(new TextEditInfo(position, 0, indent), false) : void
 >                                                                       : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^            ^^              ^^       ^^^^^    
+>                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^            ^^              ^^       ^^^^^    
+>                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
 >new TextEditInfo(position, 0, indent) : any
 >                                      : ^^^
 >TextEditInfo : any
@@ -4793,7 +4793,7 @@ module Formatting {
 
         private AdjustStartOffsetIfNeeded(token: TokenSpan, node: ParseNode): void
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^         ^^    ^^         ^^^^^    
+>                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -4982,7 +4982,7 @@ module Formatting {
 
         private IsMultiLineString(token: TokenSpan): boolean {
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^         ^^^^^       
+>                  : ^     ^^^^^^^^^^^^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index b7365ddb1c871..6e2f15b99bac9 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -1542,7 +1542,7 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^                    
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1552,13 +1552,13 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
->                            : ^^^^^^                    
+>                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^                    
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1568,7 +1568,7 @@ export declare module "use_glo_M1_public" {
 
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
->                             : ^^^^^^                    
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1646,7 +1646,7 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_public : new () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^                     
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1656,13 +1656,13 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_public : () => use_glo_M4_private.c1
->                             : ^^^^^^                     
+>                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
     var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_private : new () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^                     
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1672,7 +1672,7 @@ declare module "use_glo_M3_private" {
 
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_private : () => use_glo_M4_private.c1
->                              : ^^^^^^                     
+>                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >use_glo_M4_private : any
 >                   : ^^^
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
index 7bc83bc1f9987..ff9599ec47844 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
@@ -6,7 +6,7 @@ declare namespace lf {
   export interface Transaction {
     attach(query: query.Builder): Promise<Array<Object>>
 >attach : (query: query.Builder) => Promise<Array<Object>>
->       : ^     ^^             ^^^^^                      
+>       : ^     ^^^^^^^^^^^^^^^^^^^^                      
 >query : query.Builder
 >      : ^^^^^^^^^^^^^
 >query : any
@@ -38,7 +38,7 @@ declare namespace lf {
 
     stats(): TransactionStats
 >stats : () => TransactionStats
->      : ^^^^^^                
+>      : ^^^^^^^^^^^^^^^^^^^^^^
   }
 }
 === lovefield.js ===
@@ -60,7 +60,7 @@ lf.Transaction = function() {};
  */
 lf.Transaction.prototype.begin = function(scope) {};
 >lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                                                    : ^     ^^                      ^^^^^         
+>                                                    : ^     ^^                      ^^^^^^^^^^^^^^
 >lf.Transaction.prototype.begin : any
 >                               : ^^^
 >lf.Transaction.prototype : any
@@ -76,7 +76,7 @@ lf.Transaction.prototype.begin = function(scope) {};
 >begin : any
 >      : ^^^
 >function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                   : ^     ^^                      ^^^^^         
+>                   : ^     ^^                      ^^^^^^^^^^^^^^
 >scope : lf.schema.Table[]
 >      : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 092de33da333b..7cb4b6c38b526 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -34,7 +34,7 @@ declare module Sample.Thing {
   
   		getDomNode(): Element;
 >getDomNode : () => Element
->           : ^^^^^^       
+>           : ^^^^^^^^^^^^^
 		
 		addWidget(widgetId:string, widget:IWidget);
 >addWidget : (widgetId: string, widget: IWidget) => any
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
index 650478677ba83..b9724d792d72b 100644
--- a/tests/baselines/reference/recursiveMappedTypes.types
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -35,8 +35,8 @@ type tup = [number, number, number, number];
 >    : ^^^
 
 function foo(arg: Circular<tup>): tup {
->foo : (arg: Circular<tup>) => tup
->    : ^   ^^             ^^^^^   
+>foo : (arg: any) => tup
+>    : ^   ^^^^^^^^^^   
 >arg : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types
index 9f8d4d2de2a60..86b2b2a76f206 100644
--- a/tests/baselines/reference/recursiveTypeComparison2.types
+++ b/tests/baselines/reference/recursiveTypeComparison2.types
@@ -54,7 +54,7 @@ declare module Bacon {
 >initState : U
 >          : ^
 >f : (state: U, event: Event<T>) => StateValue<U, V>
->  : ^     ^^ ^^     ^^        ^^^^^                
+>  : ^     ^^ ^^     ^^        ^^^^^^^^^^^^^^^^^^^^^
 >state : U
 >      : ^
 >event : Event<T>
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index 14fc3c854d501..ea8075748f21c 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -117,7 +117,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
 >       : ^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^ ^^          ^^^             ^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: ClassNameObject, key: keyof S) => ClassNameObject
->                                                                                                                                                                                  : ^   ^^               ^^   ^^       ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                  : ^   ^^^^^^^^^^^^^^^^^^^   ^^       ^^^^^^^^^^^^^^^^^^^^
 >obj : ClassNameObject
 >    : ^^^^^^^^^^^^^^^
 >key : keyof S
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index 6610909f4dfd1..f56cf51e130ee 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -39,56 +39,56 @@ class Three<T, U, V>{
 }
 
 function A1(): One { return null; }
->A1 : () => One
->   : ^^^^^^   
+>A1 : () => any
+>   : ^^^^^^^^^
 
 function A2(): Two { return null; }
->A2 : () => Two
->   : ^^^^^^   
+>A2 : () => any
+>   : ^^^^^^^^^
 
 function A3(): Three { return null; }
->A3 : () => Three
->   : ^^^^^^     
+>A3 : () => any
+>   : ^^^^^^^^^
 
 function B1(): Two<number> { return null; }
->B1 : () => Two<number>
->   : ^^^^^^           
+>B1 : () => any
+>   : ^^^^^^^^^
 
 function B2(): Three<string> { return null; }
->B2 : () => Three<string>
->   : ^^^^^^             
+>B2 : () => any
+>   : ^^^^^^^^^
 
 function B3(): Three<string, number> { return null; }
->B3 : () => Three<string, number>
->   : ^^^^^^                     
+>B3 : () => any
+>   : ^^^^^^^^^
 
 class C {
 >C : C
 >  : ^
 
     A1(): One { return null; }
->A1 : () => One
->   : ^^^^^^   
+>A1 : () => any
+>   : ^^^^^^^^^
 
     A2(): Two { return null; }
->A2 : () => Two
->   : ^^^^^^   
+>A2 : () => any
+>   : ^^^^^^^^^
 
     A3(): Three { return null; }
->A3 : () => Three
->   : ^^^^^^     
+>A3 : () => any
+>   : ^^^^^^^^^
 
     B1(): Two<number> { return null; }
->B1 : () => Two<number>
->   : ^^^^^^           
+>B1 : () => any
+>   : ^^^^^^^^^
 
     B2(): Three<string> { return null; }
->B2 : () => Three<string>
->   : ^^^^^^             
+>B2 : () => any
+>   : ^^^^^^^^^
 
     B3(): Three<string, number> { return null; }
->B3 : () => Three<string, number>
->   : ^^^^^^                     
+>B3 : () => any
+>   : ^^^^^^^^^
 }
 
 class D<T> {
@@ -96,24 +96,24 @@ class D<T> {
 >  : ^^^^
 
     A2(): Two<T> { return null; }
->A2 : () => Two<T>
->   : ^^^^^^      
+>A2 : () => any
+>   : ^^^^^^^^^
 
     A3(): Three<T> { return null; }
->A3 : () => Three<T>
->   : ^^^^^^        
+>A3 : () => any
+>   : ^^^^^^^^^
 
     B1(): Two<T> { return null; }
->B1 : () => Two<T>
->   : ^^^^^^      
+>B1 : () => any
+>   : ^^^^^^^^^
 
     B2(): Three<T> { return null; }
->B2 : () => Three<T>
->   : ^^^^^^        
+>B2 : () => any
+>   : ^^^^^^^^^
 
     B3(): Three<string, T> { return null; }
->B3 : () => Three<string, T>
->   : ^^^^^^                
+>B3 : () => any
+>   : ^^^^^^^^^
 }
 
 interface I<T> {
@@ -136,8 +136,8 @@ class X<T>
 >  : ^^^^
 {
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -158,8 +158,8 @@ class X<T>
 >   : ^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
@@ -181,12 +181,12 @@ class X<T>
 }
 
 declare var a: {
->a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: X; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: Y; }
->  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^
+>a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: any; }
+>  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^
 
     p1: () => X;
->p1 : () => X
->   : ^^^^^^ 
+>p1 : () => any
+>   : ^^^^^^^^^
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -207,8 +207,8 @@ declare var a: {
 >   : ^^^
 
     p6: () => Y;
->p6 : () => Y
->   : ^^^^^^ 
+>p6 : () => any
+>   : ^^^^^^^^^
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
diff --git a/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js b/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
index 45784a12d5086..e89c226b96920 100644
--- a/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
+++ b/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
@@ -41,6 +41,6 @@ export type ParamStateRecord = Record<Keyword, ParamValueTyped>;
 //// [index.d.ts]
 export const blah: {
     publicMixin: {
-        getGovernedParams: () => globalThis.ERef<import("./types.js").ParamStateRecord>;
+        getGovernedParams: () => globalThis.ERef<import("/types").ParamStateRecord>;
     };
 };
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index 18833168898e4..d4b647d19d444 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -45,7 +45,7 @@ module Foo.Bar {
 
     function foo(greeting: string): Foo.Bar.Greeter {
 >foo : (greeting: string) => Foo.Bar.Greeter
->    : ^        ^^      ^^^^^               
+>    : ^        ^^      ^^^^^^^^^^^^^^^^^^^^
 >greeting : string
 >         : ^^^^^^
 >Foo : any
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index b61028cde79de..157f53f468e87 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -8,23 +8,23 @@ import WinJS = require('staticInstanceResolution5_0');
 // these 3 should be errors
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^     ^^^^^^^^^
+>                   : ^  ^^^^^^^^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
 var y = function (w2: WinJS) { }
 >y : (w2: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >function (w2: WinJS) { } : (w2: WinJS) => void
->                         : ^  ^^     ^^^^^^^^^
+>                         : ^  ^^^^^^^^^^^^^^^^
 >w2 : WinJS
 >   : ^^^^^
 
 function z(w3: WinJS) { }
 >z : (w3: WinJS) => void
->  : ^  ^^     ^^^^^^^^^
+>  : ^  ^^^^^^^^^^^^^^^^
 >w3 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
index 296bd6f3ed763..2c0cdd3fb0024 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
@@ -12,7 +12,7 @@ class C<T> {
 
     static f(x: T) {}
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
@@ -27,7 +27,7 @@ class C2<T, U> {
 
     static f(x: U) { }
 >f : (x: U) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : U
 >  : ^
 }
@@ -42,7 +42,7 @@ class C3<T extends Date> {
 
     static f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^ ^^^^^^^^^
+>  : ^ ^^^^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
index 4faf575220e70..5de409da74475 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
@@ -7,7 +7,7 @@ class C<T> {
 
     static s(p: T) { return p; }
 >s : (p: T) => T
->  : ^ ^^ ^^^^^^
+>  : ^ ^^^^^^^^^
 >p : T
 >  : ^
 >p : T
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index abffd78a7f044..9af014859e0cb 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -101,7 +101,7 @@ function foo() {
 
     function foo(x: private.x) { }
 >foo : (x: private.x) => void
->    : ^ ^^         ^^^^^^^^^
+>    : ^ ^^^^^^^^^^^^^^^^^^^^
 >x : private.x
 >  : ^^^^^^^^^
 >private : any
@@ -109,7 +109,7 @@ function foo() {
 
     function foo1(x: private.package.x) { }
 >foo1 : (x: private.package.x) => void
->     : ^ ^^                 ^^^^^^^^^
+>     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : private.package.x
 >  : ^^^^^^^^^^^^^^^^^
 >private : any
@@ -119,7 +119,7 @@ function foo() {
 
     function foo2(x: private.package.protected) { }
 >foo2 : (x: private.package.protected) => void
->     : ^ ^^                         ^^^^^^^^^
+>     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : private.package.protected
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >private : any
diff --git a/tests/baselines/reference/thisTypeErrors.types b/tests/baselines/reference/thisTypeErrors.types
index 47ecf4c09ddd2..a336a9aa6e191 100644
--- a/tests/baselines/reference/thisTypeErrors.types
+++ b/tests/baselines/reference/thisTypeErrors.types
@@ -6,8 +6,8 @@ var x1: this;
 >   : ^^^
 
 var x2: { a: this };
->x2 : { a: this; }
->   : ^^^^^    ^^^
+>x2 : { a: any; }
+>   : ^^^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -16,8 +16,8 @@ var x3: this[];
 >   : ^^^^^
 
 function f1(x: this): this {
->f1 : (x: this) => this
->   : ^ ^^    ^^^^^    
+>f1 : (x: any) => any
+>   : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -32,18 +32,18 @@ function f1(x: this): this {
 
 interface I1 {
     a: { x: this };
->a : { x: this; }
->  : ^^^^^    ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => this
->  : ^^^^^^    
+>b : () => any
+>  : ^^^^^^^^^
 
     c: { new (): this };
->c : new () => this
->  : ^^^^^^^^^^    
+>c : new () => any
+>  : ^^^^^^^^^^^^^
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -52,10 +52,10 @@ interface I1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: this): this; }
->  : ^^^^ ^^    ^^^    ^^^
->f : (x: this) => this
->  : ^ ^^    ^^^^^    
+>e : { f(x: any): any; }
+>  : ^^^^ ^^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 }
@@ -65,18 +65,18 @@ class C1 {
 >   : ^^
 
     a: { x: this };
->a : { x: this; }
->  : ^^^^^    ^^^
+>a : { x: any; }
+>  : ^^^^^^^^^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => this
->  : ^^^^^^    
+>b : () => any
+>  : ^^^^^^^^^
 
     c: { new (): this };
->c : new () => this
->  : ^^^^^^^^^^    
+>c : new () => any
+>  : ^^^^^^^^^^^^^
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -85,10 +85,10 @@ class C1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: this): this; }
->  : ^^^^ ^^    ^^^    ^^^
->f : (x: this) => this
->  : ^ ^^    ^^^^^    
+>e : { f(x: any): any; }
+>  : ^^^^ ^^^^^^^^^^^^^^
+>f : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 }
@@ -110,8 +110,8 @@ class C2 {
 >          : ^^^^^^^^^
 
     static foo(x: this): this {
->foo : (x: this) => this
->    : ^ ^^    ^^^^^    
+>foo : (x: any) => any
+>    : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -141,14 +141,14 @@ class C3 {
 >   : ^^
 
     x1 = {
->x1 : { g(x: this): this; }
->   : ^^^^ ^^    ^^^    ^^^
->{        g(x: this): this {            return undefined;        }    } : { g(x: this): this; }
->                                                                       : ^^^^ ^^    ^^^    ^^^
+>x1 : { g(x: any): any; }
+>   : ^^^^ ^^^^^^^^^^^^^^
+>{        g(x: this): this {            return undefined;        }    } : { g(x: any): any; }
+>                                                                       : ^^^^ ^^^^^^^^^^^^^^
 
         g(x: this): this {
->g : (x: this) => this
->  : ^ ^^    ^^^^^    
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -162,8 +162,8 @@ class C3 {
 >  : ^^^^^^^^^^
 
         function g(x: this): this {
->g : (x: this) => this
->  : ^ ^^    ^^^^^    
+>g : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
@@ -172,14 +172,14 @@ class C3 {
 >          : ^^^^^^^^^
         }
         let x2 = {
->x2 : { h(x: this): this; }
->   : ^^^^ ^^    ^^^    ^^^
->{            h(x: this): this {                return undefined;            }        } : { h(x: this): this; }
->                                                                                       : ^^^^ ^^    ^^^    ^^^
+>x2 : { h(x: any): any; }
+>   : ^^^^ ^^^^^^^^^^^^^^
+>{            h(x: this): this {                return undefined;            }        } : { h(x: any): any; }
+>                                                                                       : ^^^^ ^^^^^^^^^^^^^^
 
             h(x: this): this {
->h : (x: this) => this
->  : ^ ^^    ^^^^^    
+>h : (x: any) => any
+>  : ^ ^^^^^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index 7fda3c139ac01..b493759532198 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -58,7 +58,7 @@ function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 
 function hasMissingIsKeyword(): x {
 >hasMissingIsKeyword : () => x
->                    : ^^^^^^ 
+>                    : ^^^^^^^
 
     return true;
 >true : true
@@ -330,7 +330,7 @@ var b1: b is A;
 
 function b2(a: b is A) {};
 >b2 : (a: b, is: any, A: any) => void
->   : ^ ^^ ^^  ^^^^^^^ ^^^^^^^^^^^^^^
+>   : ^ ^^^^^  ^^^^^^^ ^^^^^^^^^^^^^^
 >a : b
 >  : ^
 >is : any
@@ -339,8 +339,8 @@ function b2(a: b is A) {};
 >  : ^^^
 
 function b3(): A | b is A {
->b3 : () => A | b
->   : ^^^^^^     
+>b3 : () => any
+>   : ^^^^^^^^^
 >is : any
 >   : ^^^
 >A : typeof A
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
index 47f7c866ed0ee..4b6de36790962 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
@@ -50,7 +50,7 @@ interface I<T, U extends T, V extends U> {
 
 function foo<T, U extends T>(x: T, y: U): V { // error
 >foo : <T, U extends T>(x: T, y: U) => V
->    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
+>    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^
 >x : T
 >  : ^
 >y : U
@@ -58,7 +58,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
     function bar<V extends T, W extends U>(): X { // error
 >bar : <V extends T, W extends U>() => X
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -85,7 +85,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
 function foo2<U extends T, T>(x: T, y: U): W { // error
 >foo2 : <U extends T, T>(x: T, y: U) => W
->     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
+>     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^
 >x : T
 >  : ^
 >y : U
@@ -93,7 +93,7 @@ function foo2<U extends T, T>(x: T, y: U): W { // error
 
     function bar<V extends T, W extends U>(): Y { // error
 >bar : <V extends T, W extends U>() => Y
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -130,7 +130,7 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
     function bar<V extends T, W extends U>(r: X, s: Y) { // error
 >bar : <V extends T, W extends U>(r: X, s: Y) => void
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^
 >r : X
 >  : ^
 >s : Y
@@ -163,9 +163,9 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
 var f4 = <U extends T, T>(x: V, y: X) => { // error
 >f4 : <U extends T, T>(x: V, y: X) => void
->   : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>   : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
 ><U extends T, T>(x: V, y: X) => { // error    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: V, y: X) => void
->                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
+>                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
 >x : V
 >  : ^
 >y : X
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.types b/tests/baselines/reference/typeParametersInStaticAccessors.types
index 77f3193522c9b..24e855a13a0c1 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.types
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.types
@@ -7,13 +7,13 @@ class foo<T> {
 
     static get Foo(): () => T { return null; }
 >Foo : () => T
->    : ^^^^^^ 
+>    : ^^^^^^^
 
     static set Bar(v: { v: T }) { }
 >Bar : { v: T; }
->    : ^^^^^ ^^^
+>    : ^^^^^^^^^
 >v : { v: T; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 >v : T
 >  : ^
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.types b/tests/baselines/reference/typeParametersInStaticMethods.types
index dcba9fc2668a2..9319245303c8a 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.types
+++ b/tests/baselines/reference/typeParametersInStaticMethods.types
@@ -9,11 +9,11 @@ class foo<T> {
 >M : (x: (x: T) => { x: { y: T; }; }) => void
 >  : ^ ^^                           ^^^^^^^^^
 >x : (x: T) => { x: { y: T; }; }
->  : ^ ^^ ^^^^^                 
+>  : ^ ^^^^^^^^                 
 >x : T
 >  : ^
 >x : { y: T; }
->  : ^^^^^ ^^^
+>  : ^^^^^^^^^
 >y : T
 >  : ^
     }
diff --git a/tests/baselines/reference/typedefTagTypeResolution.types b/tests/baselines/reference/typedefTagTypeResolution.types
index c193bf7fa420b..9712bc5ef0ff8 100644
--- a/tests/baselines/reference/typedefTagTypeResolution.types
+++ b/tests/baselines/reference/typedefTagTypeResolution.types
@@ -9,8 +9,8 @@
  * @return {T}
  */
 function f(x) {
->f : <U>(x: U) => T
->  : ^ ^^ ^^ ^^^^^ 
+>f : <U>(x: U) => U
+>  : ^ ^^ ^^ ^^^^^^
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/typeofInObjectLiteralType.types b/tests/baselines/reference/typeofInObjectLiteralType.types
index 0e5ca99fcb430..5aa62c161c84c 100644
--- a/tests/baselines/reference/typeofInObjectLiteralType.types
+++ b/tests/baselines/reference/typeofInObjectLiteralType.types
@@ -2,8 +2,8 @@
 
 === typeofInObjectLiteralType.ts ===
 var a: { b: number; c: typeof b }; // Should give error for attempting to use type query on b.
->a : { b: number; c: typeof b; }
->  : ^^^^^      ^^^^^        ^^^
+>a : { b: number; c: any; }
+>  : ^^^^^      ^^^^^^^^^^^
 >b : number
 >  : ^^^^^^
 >c : any
diff --git a/tests/baselines/reference/undeclaredModuleError.types b/tests/baselines/reference/undeclaredModuleError.types
index da0d54d795717..ce795bd32a875 100644
--- a/tests/baselines/reference/undeclaredModuleError.types
+++ b/tests/baselines/reference/undeclaredModuleError.types
@@ -11,7 +11,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >path : string
 >     : ^^^^^^
 >accept : (stat: fs.Stats, name: string) => boolean
->       : ^    ^^        ^^    ^^      ^^^^^       
+>       : ^    ^^^^^^^^^^^^    ^^      ^^^^^       
 >stat : fs.Stats
 >     : ^^^^^^^^
 >fs : any
@@ -23,7 +23,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >error : Error
 >      : ^^^^^
 >results : { name: string; stat: fs.Stats; }[]
->        : ^^^^^^^^      ^^^^^^^^        ^^^^^
+>        : ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^
 >name : string
 >     : ^^^^^^
 >stat : fs.Stats
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index d1c1862c98357..ffa16ff343598 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -19,7 +19,7 @@ interface Query<T> {
 >item : T
 >     : ^
 >resultSelector : (outer: T, inner: U) => R
->               : ^     ^^ ^^     ^^ ^^^^^ 
+>               : ^     ^^ ^^     ^^ ^^^^^^
 >outer : T
 >      : ^
 >inner : U
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.types b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
index 8ade76d37e201..a35d347932961 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.types
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
@@ -11,7 +11,7 @@ class Linq {
 >values : T[]
 >       : ^^^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^ 
+>     : ^ ^^ ^^^^^^
 >v : T
 >  : ^
 
@@ -61,7 +61,7 @@ class Linq {
 >func(values[i]) : A
 >                : ^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^ 
+>     : ^ ^^ ^^^^^^
 >values[i] : T
 >          : ^
 >values : T[]
diff --git a/tests/baselines/reference/unknownSymbols1.types b/tests/baselines/reference/unknownSymbols1.types
index 4d2c58ee5ad39..d762a0d699509 100644
--- a/tests/baselines/reference/unknownSymbols1.types
+++ b/tests/baselines/reference/unknownSymbols1.types
@@ -13,7 +13,7 @@ var y: asdf;
 
 function foo(x: asdf, y: number): asdf { }
 >foo : (x: asdf, y: number) => asdf
->    : ^ ^^    ^^ ^^      ^^^^^    
+>    : ^ ^^^^^^^^ ^^      ^^^^^^^^^
 >x : asdf
 >  : ^^^^
 >y : number
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
index 764075a757be3..1edc387f4bf10 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
@@ -18,7 +18,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: import("./doesntexist.js").Foo);`,
+      insertText: `method(param: any);`,
       filterText: "method",
       hasAction: undefined,
     },
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
index 072725ac2f745..61396a635886b 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
@@ -21,7 +21,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: import("./doesntexist.js").Foo);`,
+      insertText: `method(param: any);`,
       filterText: "method",
       hasAction: undefined,
     },

From 2e52805eaa6594e9df92dc9976699cd6347547ab Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Fri, 2 Aug 2024 20:06:25 -0700
Subject: [PATCH 08/11] Missing internalFlags

---
 src/compiler/checker.ts                       |  6 +-
 .../declarationEmitOutFileBundlePaths.js      | 25 +----
 .../baselines/reference/exportNamespace_js.js |  2 +-
 .../jsDeclarationEmitDoesNotRenameImport.js   | 47 +---------
 .../jsDeclarationsClassExtendsVisibility.js   | 30 +-----
 .../jsDeclarationsCommonjsRelativePath.js     |  2 +-
 .../jsDeclarationsCrossfileMerge.errors.txt   | 17 ++++
 .../reference/jsDeclarationsCrossfileMerge.js | 32 +------
 .../jsDeclarationsCrossfileMerge.types        |  1 +
 ...AssignedClassExpressionAnonymousWithSub.js | 28 +-----
 ...ignedConstructorFunctionWithSub.errors.txt | 20 ++++
 ...xportAssignedConstructorFunctionWithSub.js | 30 ------
 ...rtAssignedConstructorFunctionWithSub.types |  2 +
 .../jsDeclarationsExportAssignedVisibility.js | 25 +----
 .../reference/jsDeclarationsExportForms.js    | 91 ++-----------------
 .../reference/jsDeclarationsExportFormsErr.js |  4 +-
 .../jsDeclarationsExportedClassAliases.js     | 21 +----
 .../reference/jsDeclarationsFunctions.js      | 72 +--------------
 ...onsImportAliasExposedWithinNamespaceCjs.js |  2 +-
 .../jsDeclarationsReexportedCjsAlias.js       | 31 +------
 ...ationsReferenceToClassInstanceCrossFile.js |  2 +-
 ...ypeReassignmentFromDeclaration2.errors.txt | 14 +++
 ...rationsTypeReassignmentFromDeclaration2.js | 25 -----
 ...ionsTypeReassignmentFromDeclaration2.types |  1 +
 ...arationsWithDefaultAsNamespaceLikeMerge.js |  2 +-
 tests/baselines/reference/modulePreserve4.js  |  2 +-
 ...ationImportTypeInGlobalThisTypeArgument.js |  2 +-
 27 files changed, 90 insertions(+), 446 deletions(-)
 create mode 100644 tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
 create mode 100644 tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
 create mode 100644 tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 4d97009dc6aa3..67c121959f6da 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -50105,15 +50105,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 const parseDecl = getParseTreeNode(decl);
                 return !!parseNode && !!parseDecl && (isVariableDeclaration(parseDecl) || isBindingElement(parseDecl)) && isBindingCapturedByNode(parseNode, parseDecl);
             },
-            getDeclarationStatementsForSourceFile: (node, flags, tracker) => {
+            getDeclarationStatementsForSourceFile: (node, flags, internalFlags, tracker) => {
                 const n = getParseTreeNode(node) as SourceFile;
                 Debug.assert(n && n.kind === SyntaxKind.SourceFile, "Non-sourcefile node passed into getDeclarationsForSourceFile");
                 const sym = getSymbolOfDeclaration(node);
                 if (!sym) {
-                    return !node.locals ? [] : nodeBuilder.symbolTableToDeclarationStatements(node.locals, node, flags, tracker);
+                    return !node.locals ? [] : nodeBuilder.symbolTableToDeclarationStatements(node.locals, node, flags, internalFlags, tracker);
                 }
                 resolveExternalModuleSymbol(sym); // ensures cjs export assignment is setup
-                return !sym.exports ? [] : nodeBuilder.symbolTableToDeclarationStatements(sym.exports, node, flags, tracker);
+                return !sym.exports ? [] : nodeBuilder.symbolTableToDeclarationStatements(sym.exports, node, flags, internalFlags, tracker);
             },
             isImportRequiredByAugmentation,
             isDefinitelyReferenceToGlobalSymbolObject,
diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
index 53024d844f276..02b1bd623bfcd 100644
--- a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
+++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js
@@ -25,28 +25,5 @@ declare module "versions.static" {
 }
 declare module "index" {
     export { versions };
-    import versions from "js/versions.static";
+    import versions from "versions.static";
 }
-
-
-//// [DtsFileErrors]
-
-
-js/index.d.ts(10,26): error TS2307: Cannot find module 'js/versions.static' or its corresponding type declarations.
-
-
-==== js/index.d.ts (1 errors) ====
-    declare module "versions.static" {
-        const _default: {
-            "@a/b": string;
-            "@a/c": string;
-        };
-        export default _default;
-    }
-    declare module "index" {
-        export { versions };
-        import versions from "js/versions.static";
-                             ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'js/versions.static' or its corresponding type declarations.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/exportNamespace_js.js b/tests/baselines/reference/exportNamespace_js.js
index 180158f7c22f5..4e64bdc174398 100644
--- a/tests/baselines/reference/exportNamespace_js.js
+++ b/tests/baselines/reference/exportNamespace_js.js
@@ -35,6 +35,6 @@ A;
 export class A {
 }
 //// [b.d.ts]
-export type * from "a";
+export type * from "./a";
 //// [c.d.ts]
 export {};
diff --git a/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js b/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
index 84d324d266bf0..c519ea52a7c7d 100644
--- a/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
+++ b/tests/baselines/reference/jsDeclarationEmitDoesNotRenameImport.js
@@ -46,7 +46,7 @@ declare class Test {
 //// [index.d.ts]
 export default X;
 export type Options = {
-    test?: typeof import("Test").default | undefined;
+    test?: typeof import("./Test.js").default | undefined;
 };
 /**
  * @typedef {Object} Options
@@ -57,49 +57,6 @@ declare class X extends Test {
      * @param {Options} options
      */
     constructor(options: Options);
-    test: import("Test").default | undefined;
+    test: import("./Test.js").default | undefined;
 }
 import Test from './test/Test.js';
-
-
-//// [DtsFileErrors]
-
-
-index.d.ts(3,26): error TS2307: Cannot find module 'Test' or its corresponding type declarations.
-index.d.ts(14,18): error TS2307: Cannot find module 'Test' or its corresponding type declarations.
-
-
-==== test/Test.d.ts (0 errors) ====
-    export default Test;
-    /** @module test/Test */
-    declare class Test {
-    }
-    
-==== Test.d.ts (0 errors) ====
-    export default Test;
-    /** @module Test */
-    declare class Test {
-    }
-    
-==== index.d.ts (2 errors) ====
-    export default X;
-    export type Options = {
-        test?: typeof import("Test").default | undefined;
-                             ~~~~~~
-!!! error TS2307: Cannot find module 'Test' or its corresponding type declarations.
-    };
-    /**
-     * @typedef {Object} Options
-     * @property {typeof import("./Test.js").default} [test]
-     */
-    declare class X extends Test {
-        /**
-         * @param {Options} options
-         */
-        constructor(options: Options);
-        test: import("Test").default | undefined;
-                     ~~~~~~
-!!! error TS2307: Cannot find module 'Test' or its corresponding type declarations.
-    }
-    import Test from './test/Test.js';
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
index 2347be18fa551..bbe7783650f78 100644
--- a/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsClassExtendsVisibility.js
@@ -63,36 +63,8 @@ declare class Foo extends Bar {
 declare namespace Foo {
     export { Strings };
 }
-import Bar = require("bar.js");
+import Bar = require("./bar");
 declare namespace Strings {
     let a: string;
     let b: string;
 }
-
-
-//// [DtsFileErrors]
-
-
-out/cls.d.ts(7,22): error TS2307: Cannot find module 'bar.js' or its corresponding type declarations.
-
-
-==== out/cls.d.ts (1 errors) ====
-    export = Foo;
-    declare class Foo extends Bar {
-    }
-    declare namespace Foo {
-        export { Strings };
-    }
-    import Bar = require("/.src/bar.js");
-                         ~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'bar.js' or its corresponding type declarations.
-    declare namespace Strings {
-        let a: string;
-        let b: string;
-    }
-    
-==== out/bar.d.ts (0 errors) ====
-    export = Bar;
-    declare class Bar {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
index c21f18dd919e3..f66220b072547 100644
--- a/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
+++ b/tests/baselines/reference/jsDeclarationsCommonjsRelativePath.js
@@ -18,5 +18,5 @@ export class Thing {
 }
 //// [reexport.d.ts]
 export { Thing };
-import Thing_1 = require("thing.js");
+import Thing_1 = require("./thing");
 import Thing = Thing_1.Thing;
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt b/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
new file mode 100644
index 0000000000000..8880526df413f
--- /dev/null
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.errors.txt
@@ -0,0 +1,17 @@
+index.js(4,1): error TS6232: Declaration augments declaration in another file. This cannot be serialized.
+
+
+==== index.js (1 errors) ====
+    const m = require("./exporter");
+    
+    module.exports = m.default;
+    module.exports.memberName = "thing";
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6232: Declaration augments declaration in another file. This cannot be serialized.
+!!! related TS6233 exporter.js:1:10: This is the declaration being augmented. Consider moving the augmenting declaration into the same file.
+    
+==== exporter.js (0 errors) ====
+    function validate() {}
+    
+    export default validate;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.js b/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
index 101a434ec6880..ed5d9dbe7807f 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.js
@@ -23,35 +23,13 @@ module.exports = m.default;
 module.exports.memberName = "thing";
 
 
-//// [exporter.d.ts]
-export default validate;
-declare function validate(): void;
-declare namespace validate {
-    export {};
-}
 //// [index.d.ts]
 declare const _exports: typeof m.default;
 export = _exports;
-import m = require("exporter");
-
-
-//// [DtsFileErrors]
+import m = require("./exporter");
 
 
-out/index.d.ts(3,20): error TS2307: Cannot find module 'exporter' or its corresponding type declarations.
-
-
-==== out/index.d.ts (1 errors) ====
-    declare const _exports: typeof m.default;
-    export = _exports;
-    import m = require("/.src/exporter");
-                       ~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'exporter' or its corresponding type declarations.
-    
-==== out/exporter.d.ts (0 errors) ====
-    export default validate;
-    declare function validate(): void;
-    declare namespace validate {
-        export {};
-    }
-    
\ No newline at end of file
+!!!! File out/exporter.d.ts missing from original emit, but present in noCheck emit
+//// [exporter.d.ts]
+export default validate;
+declare function validate(): void;
diff --git a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
index 635cd5dfd22c4..35d4703037c93 100644
--- a/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
+++ b/tests/baselines/reference/jsDeclarationsCrossfileMerge.types
@@ -7,6 +7,7 @@ const m = require("./exporter");
 >require("./exporter") : typeof m
 >                      : ^^^^^^^^
 >require : any
+>        : ^^^
 >"./exporter" : "./exporter"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
index 6784e764267e4..6d7c77bd70dd7 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedClassExpressionAnonymousWithSub.js
@@ -47,31 +47,5 @@ declare namespace exports {
     export { Sub };
 }
 declare class Sub {
-    instance: import("index");
+    instance: import(".");
 }
-
-
-//// [DtsFileErrors]
-
-
-out/index.d.ts(13,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
-
-
-==== out/index.d.ts (1 errors) ====
-    export = exports;
-    declare class exports {
-        /**
-         * @param {number} p
-         */
-        constructor(p: number);
-        t: number;
-    }
-    declare namespace exports {
-        export { Sub };
-    }
-    declare class Sub {
-        instance: import("index");
-                         ~~~~~~~
-!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
new file mode 100644
index 0000000000000..bb3b678582382
--- /dev/null
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.errors.txt
@@ -0,0 +1,20 @@
+jsDeclarationsExportAssignedConstructorFunctionWithSub.js(4,1): error TS9005: Declaration emit for this file requires using private name 'Sub'. An explicit type annotation may unblock declaration emit.
+jsDeclarationsExportAssignedConstructorFunctionWithSub.js(4,1): error TS9005: Declaration emit for this file requires using private name 'exports'. An explicit type annotation may unblock declaration emit.
+
+
+==== jsDeclarationsExportAssignedConstructorFunctionWithSub.js (2 errors) ====
+    /**
+     * @param {number} p
+     */
+    module.exports = function (p) {
+    ~~~~~~
+!!! error TS9005: Declaration emit for this file requires using private name 'Sub'. An explicit type annotation may unblock declaration emit.
+    ~~~~~~
+!!! error TS9005: Declaration emit for this file requires using private name 'exports'. An explicit type annotation may unblock declaration emit.
+        this.t = 12 + p;
+    }
+    module.exports.Sub = function() {
+        this.instance = new module.exports(10);
+    }
+    module.exports.Sub.prototype = { }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
index 6b0a57d9d5208..59a5017c576b5 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.js
@@ -24,33 +24,3 @@ module.exports.Sub = function () {
     this.instance = new module.exports(10);
 };
 module.exports.Sub.prototype = {};
-
-
-//// [jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts]
-declare const _exports: {
-    (p: number): void;
-    new (p: number): exports;
-    Sub: typeof Sub;
-};
-export = _exports;
-
-
-//// [DtsFileErrors]
-
-
-out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts(3,22): error TS2304: Cannot find name 'exports'.
-out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts(4,17): error TS2304: Cannot find name 'Sub'.
-
-
-==== out/jsDeclarationsExportAssignedConstructorFunctionWithSub.d.ts (2 errors) ====
-    declare const _exports: {
-        (p: number): void;
-        new (p: number): exports;
-                         ~~~~~~~
-!!! error TS2304: Cannot find name 'exports'.
-        Sub: typeof Sub;
-                    ~~~
-!!! error TS2304: Cannot find name 'Sub'.
-    };
-    export = _exports;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
index e9929796c5dfe..835fccd045001 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedConstructorFunctionWithSub.types
@@ -22,6 +22,7 @@ module.exports = function (p) {
 >this.t = 12 + p : number
 >                : ^^^^^^
 >this.t : any
+>       : ^^^
 >this : this
 >     : ^^^^
 >t : any
@@ -53,6 +54,7 @@ module.exports.Sub = function() {
 >this.instance = new module.exports(10) : exports
 >                                       : ^^^^^^^
 >this.instance : any
+>              : ^^^
 >this : this
 >     : ^^^^
 >instance : any
diff --git a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
index 05965858dac15..018aebdfec9cf 100644
--- a/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
+++ b/tests/baselines/reference/jsDeclarationsExportAssignedVisibility.js
@@ -45,27 +45,4 @@ export = Container;
 declare class Container {
     usage: Obj;
 }
-import Obj = require("obj.js");
-
-
-//// [DtsFileErrors]
-
-
-out/index.d.ts(5,22): error TS2307: Cannot find module 'obj.js' or its corresponding type declarations.
-
-
-==== out/index.d.ts (1 errors) ====
-    export = Container;
-    declare class Container {
-        usage: Obj;
-    }
-    import Obj = require("/.src/obj.js");
-                         ~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'obj.js' or its corresponding type declarations.
-    
-==== out/obj.d.ts (0 errors) ====
-    export = Obj;
-    declare class Obj {
-        x: number;
-    }
-    
\ No newline at end of file
+import Obj = require("./obj");
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js
index 568f2288f19e5..133e66706bbca 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.js
+++ b/tests/baselines/reference/jsDeclarationsExportForms.js
@@ -166,10 +166,10 @@ export class Foo {
 //// [func.d.ts]
 export function func(): void;
 //// [bar.d.ts]
-export * from "cls";
+export * from "./cls";
 //// [bar2.d.ts]
-export * from "func";
-export * from "cls";
+export * from "./func";
+export * from "./cls";
 //// [baz.d.ts]
 export { Foo };
 import { Foo } from "./cls";
@@ -184,92 +184,15 @@ export { ns as classContainer };
 import * as ns from "./cls";
 //// [cjs.d.ts]
 export { ns };
-import ns = require("cls");
+import ns = require("./cls");
 //// [cjs2.d.ts]
 export = ns;
-import ns = require("cls");
+import ns = require("./cls");
 //// [cjs3.d.ts]
 export { ns };
-import ns = require("cls");
+import ns = require("./cls");
 //// [cjs4.d.ts]
 export { ns as names };
-import ns = require("cls");
+import ns = require("./cls");
 //// [includeAll.d.ts]
 export {};
-
-
-//// [DtsFileErrors]
-
-
-out/bar.d.ts(1,15): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-out/bar2.d.ts(1,15): error TS2307: Cannot find module 'func' or its corresponding type declarations.
-out/bar2.d.ts(2,15): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-out/cjs.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-out/cjs2.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-out/cjs3.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-out/cjs4.d.ts(2,21): error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-
-
-==== out/cls.d.ts (0 errors) ====
-    export class Foo {
-    }
-    
-==== out/func.d.ts (0 errors) ====
-    export function func(): void;
-    
-==== out/bar.d.ts (1 errors) ====
-    export * from "cls";
-                  ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/bar2.d.ts (2 errors) ====
-    export * from "func";
-                  ~~~~~~
-!!! error TS2307: Cannot find module 'func' or its corresponding type declarations.
-    export * from "cls";
-                  ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/baz.d.ts (0 errors) ====
-    export { Foo };
-    import { Foo } from "./cls";
-    
-==== out/bat.d.ts (0 errors) ====
-    export default ns;
-    import * as ns from "./cls";
-    
-==== out/ban.d.ts (0 errors) ====
-    export { ns };
-    import * as ns from "./cls";
-    
-==== out/bol.d.ts (0 errors) ====
-    export { ns as classContainer };
-    import * as ns from "./cls";
-    
-==== out/cjs.d.ts (1 errors) ====
-    export { ns };
-    import ns = require("cls");
-                        ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/cjs2.d.ts (1 errors) ====
-    export = ns;
-    import ns = require("cls");
-                        ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/cjs3.d.ts (1 errors) ====
-    export { ns };
-    import ns = require("cls");
-                        ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/cjs4.d.ts (1 errors) ====
-    export { ns as names };
-    import ns = require("cls");
-                        ~~~~~
-!!! error TS2307: Cannot find module 'cls' or its corresponding type declarations.
-    
-==== out/includeAll.d.ts (0 errors) ====
-    export {};
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
index b0db6610b85fa..508ee7828f408 100644
--- a/tests/baselines/reference/jsDeclarationsExportFormsErr.js
+++ b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
@@ -71,10 +71,10 @@ export class Foo {
 }
 //// [bar.d.ts]
 export = ns;
-import ns = require("cls");
+import ns = require("./cls");
 //// [bin.d.ts]
 export {};
 //// [globalNs.d.ts]
-export * from "cls";
+export * from "./cls";
 //// [includeAll.d.ts]
 export {};
diff --git a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
index 893f21a275c79..3a79339339c98 100644
--- a/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
+++ b/tests/baselines/reference/jsDeclarationsExportedClassAliases.js
@@ -59,23 +59,4 @@ export class FancyError extends Error {
 }
 //// [index.d.ts]
 export { errors };
-import errors = require("utils/errors");
-
-
-//// [DtsFileErrors]
-
-
-out/index.d.ts(2,25): error TS2307: Cannot find module 'utils/errors' or its corresponding type declarations.
-
-
-==== out/index.d.ts (1 errors) ====
-    export { errors };
-    import errors = require("/.src/utils/errors");
-                            ~~~~~~~~~~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'utils/errors' or its corresponding type declarations.
-    
-==== out/errors.d.ts (0 errors) ====
-    export class FancyError extends Error {
-        constructor(status: any);
-    }
-    
\ No newline at end of file
+import errors = require("./errors");
diff --git a/tests/baselines/reference/jsDeclarationsFunctions.js b/tests/baselines/reference/jsDeclarationsFunctions.js
index 1f430b494989d..a3676ec28ae4c 100644
--- a/tests/baselines/reference/jsDeclarationsFunctions.js
+++ b/tests/baselines/reference/jsDeclarationsFunctions.js
@@ -165,7 +165,7 @@ declare class Cls {
 export function g(a: {
     x: string;
 }, b: {
-    y: typeof import("index").b;
+    y: typeof import(".").b;
 }): void;
 /**
  * @param {{x: string}} a
@@ -174,74 +174,6 @@ export function g(a: {
 declare function hh(a: {
     x: string;
 }, b: {
-    y: typeof import("index").b;
+    y: typeof import(".").b;
 }): void;
 export { hh as h, i as ii, j as jj };
-
-
-//// [DtsFileErrors]
-
-
-out/index.d.ts(42,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
-out/index.d.ts(51,22): error TS2307: Cannot find module 'index' or its corresponding type declarations.
-
-
-==== out/index.d.ts (2 errors) ====
-    export function a(): void;
-    export function b(): void;
-    export namespace b {
-        let cat: string;
-    }
-    export function c(): void;
-    export namespace c {
-        export { Cls };
-    }
-    /**
-     * @param {number} a
-     * @param {number} b
-     * @return {string}
-     */
-    export function d(a: number, b: number): string;
-    /**
-     * @template T,U
-     * @param {T} a
-     * @param {U} b
-     * @return {T & U}
-     */
-    export function e<T, U>(a: T, b: U): T & U;
-    /**
-     * @template T
-     * @param {T} a
-     */
-    export function f<T>(a: T): T;
-    export namespace f {
-        export { f as self };
-    }
-    export function i(): void;
-    export function j(): void;
-    declare class Cls {
-    }
-    /**
-     * @param {{x: string}} a
-     * @param {{y: typeof b}} b
-     */
-    export function g(a: {
-        x: string;
-    }, b: {
-        y: typeof import("index").b;
-                         ~~~~~~~
-!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
-    }): void;
-    /**
-     * @param {{x: string}} a
-     * @param {{y: typeof b}} b
-     */
-    declare function hh(a: {
-        x: string;
-    }, b: {
-        y: typeof import("index").b;
-                         ~~~~~~~
-!!! error TS2307: Cannot find module 'index' or its corresponding type declarations.
-    }): void;
-    export { hh as h, i as ii, j as jj };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
index 757223804f054..bd27e71768a9e 100644
--- a/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
+++ b/tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js
@@ -96,4 +96,4 @@ export const testFnTypes: {
 export namespace testFnTypes {
     type input = boolean | myTypes.typeC;
 }
-import { myTypes } from "file";
+import { myTypes } from "./file.js";
diff --git a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
index 63253285e6b5a..d8f635713a538 100644
--- a/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
+++ b/tests/baselines/reference/jsDeclarationsReexportedCjsAlias.js
@@ -62,33 +62,6 @@ export class SomeClass {
     a(): number;
 }
 //// [main.d.ts]
-import { SomeClass } from "lib";
-import { SomeClass as Another } from "lib";
+import { SomeClass } from "./lib";
+import { SomeClass as Another } from "./lib";
 export { SomeClass, Another };
-
-
-//// [DtsFileErrors]
-
-
-out/main.d.ts(1,27): error TS2307: Cannot find module 'lib' or its corresponding type declarations.
-out/main.d.ts(2,38): error TS2307: Cannot find module 'lib' or its corresponding type declarations.
-
-
-==== out/main.d.ts (2 errors) ====
-    import { SomeClass } from "/.src/lib";
-                              ~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'lib' or its corresponding type declarations.
-    import { SomeClass as Another } from "/.src/lib";
-                                         ~~~~~~~~~~~
-!!! error TS2307: Cannot find module 'lib' or its corresponding type declarations.
-    export { SomeClass, Another };
-    
-==== out/lib.d.ts (0 errors) ====
-    /**
-     * @param {string} a
-     */
-    export function bar(a: string): string;
-    export class SomeClass {
-        a(): number;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
index daedc30c073c1..b24408dac789b 100644
--- a/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
+++ b/tests/baselines/reference/jsDeclarationsReferenceToClassInstanceCrossFile.js
@@ -58,6 +58,6 @@ export class Render {
      */
     addRectangle(): Rectangle;
 }
-import { Rectangle } from "rectangle";
+import { Rectangle } from "./rectangle";
 //// [test.d.ts]
 export {};
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt
new file mode 100644
index 0000000000000..5d2892b1fae3a
--- /dev/null
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.errors.txt
@@ -0,0 +1,14 @@
+index.js(1,1): error TS9006: Declaration emit for this file requires using private name 'Item' from module '"some-mod"'. An explicit type annotation may unblock declaration emit.
+
+
+==== index.js (1 errors) ====
+    const items = require("./some-mod")();
+    ~~~~~
+!!! error TS9006: Declaration emit for this file requires using private name 'Item' from module '"some-mod"'. An explicit type annotation may unblock declaration emit.
+    module.exports = items;
+==== some-mod.d.ts (0 errors) ====
+    interface Item {
+        x: string;
+    }
+    declare function getItems(): Item[];
+    export = getItems;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
index eb6604c53a83f..02068c5cef713 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.js
@@ -13,28 +13,3 @@ module.exports = items;
 //// [index.js]
 var items = require("./some-mod")();
 module.exports = items;
-
-
-//// [index.d.ts]
-export = items;
-declare const items: Item[];
-
-
-//// [DtsFileErrors]
-
-
-out/index.d.ts(2,22): error TS2304: Cannot find name 'Item'.
-
-
-==== out/index.d.ts (1 errors) ====
-    export = items;
-    declare const items: Item[];
-                         ~~~~
-!!! error TS2304: Cannot find name 'Item'.
-    
-==== some-mod.d.ts (0 errors) ====
-    interface Item {
-        x: string;
-    }
-    declare function getItems(): Item[];
-    export = getItems;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
index 18f1c4b2bae96..0b6e7aa016495 100644
--- a/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
+++ b/tests/baselines/reference/jsDeclarationsTypeReassignmentFromDeclaration2.types
@@ -9,6 +9,7 @@ const items = require("./some-mod")();
 >require("./some-mod") : () => Item[]
 >                      : ^^^^^^^^^^  
 >require : any
+>        : ^^^
 >"./some-mod" : "./some-mod"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js b/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
index ca4300d5c45c3..fbaea7f86741d 100644
--- a/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
+++ b/tests/baselines/reference/jsDeclarationsWithDefaultAsNamespaceLikeMerge.js
@@ -25,7 +25,7 @@ export default {
 //// [index.d.ts]
 declare namespace _default {
     namespace computed {
-        let panels: import("/helper").Computed;
+        let panels: import("./helper").Computed;
     }
 }
 export default _default;
diff --git a/tests/baselines/reference/modulePreserve4.js b/tests/baselines/reference/modulePreserve4.js
index 7e0cd761f17b1..536f52f3a4897 100644
--- a/tests/baselines/reference/modulePreserve4.js
+++ b/tests/baselines/reference/modulePreserve4.js
@@ -223,6 +223,6 @@ export {};
 //// [main3.d.cts]
 export {};
 //// [main4.d.cts]
-export const x: typeof import("/g");
+export const x: typeof import("./g");
 //// [dummy.d.ts]
 export {};
diff --git a/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js b/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
index e89c226b96920..45784a12d5086 100644
--- a/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
+++ b/tests/baselines/reference/reuseTypeAnnotationImportTypeInGlobalThisTypeArgument.js
@@ -41,6 +41,6 @@ export type ParamStateRecord = Record<Keyword, ParamValueTyped>;
 //// [index.d.ts]
 export const blah: {
     publicMixin: {
-        getGovernedParams: () => globalThis.ERef<import("/types").ParamStateRecord>;
+        getGovernedParams: () => globalThis.ERef<import("./types.js").ParamStateRecord>;
     };
 };

From 96ee387f49dc0b6cca1e563ed5761692c06bf148 Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Mon, 5 Aug 2024 15:20:19 -0700
Subject: [PATCH 09/11] Return AllowUnresolvedTypes

---
 src/compiler/checker.ts                       |  54 +-
 src/harness/typeWriter.ts                     |   2 +-
 src/services/codefixes/helpers.ts             |   2 +-
 .../baselines/reference/ArrowFunction1.types  |   4 +-
 ...duleMemberThatUsesClassTypeParameter.types |   2 +-
 tests/baselines/reference/arguments.types     |  12 +-
 .../arrayReferenceWithoutTypeArgs.types       |   4 +-
 .../asyncAwaitIsolatedModules_es2017.types    |  24 +-
 .../asyncAwaitIsolatedModules_es5.types       |  24 +-
 .../asyncAwaitIsolatedModules_es6.types       |  24 +-
 .../badExternalModuleReference.types          |   2 +-
 .../reference/bluebirdStaticThis.types        |   2 +-
 .../reference/circularBaseTypes.types         |   4 +-
 .../reference/complicatedPrivacy.types        |   4 +-
 ...structorWithIncompleteTypeAnnotation.types |   8 +-
 ...arationEmitComputedPropertyNameEnum2.types |   8 +-
 .../errorsInGenericTypeReference.types        |  22 +-
 ...orMetadataUnresolvedTypeObjectInEmit.types |   2 +-
 ...rtSpecifierAndLocalMemberDeclaration.types |   2 +-
 ...pecifierReferencingOuterDeclaration3.types |   2 +-
 ...pecifierReferencingOuterDeclaration4.types |   2 +-
 tests/baselines/reference/extendArray.types   |   2 +-
 .../functionTypesLackingReturnTypes.types     |   2 +-
 ...nctionVariableInReturnTypeAnnotation.types |   4 +-
 ...icCallWithGenericSignatureArguments2.types |   2 +-
 ...icClassWithStaticsUsingTypeArguments.types |  12 +-
 .../genericLambaArgWithoutTypeArguments.types |   4 +-
 ...cRecursiveImplicitConstructorErrors3.types |  28 +-
 ...icTypeReferenceWithoutTypeArgument.d.types |  12 +-
 ...ericTypeReferenceWithoutTypeArgument.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument2.types |  32 +-
 ...ricTypeReferenceWithoutTypeArgument3.types |  12 +-
 .../genericsWithoutTypeParameters1.types      |  16 +-
 .../reference/importTypeGeneric.types         |   8 +-
 .../reference/importedModuleAddToGlobal.types |   2 +-
 .../reference/intrinsicKeyword.types          |   2 +-
 .../jsdocFunctionTypeFalsePositive.types      |   2 +-
 .../reference/jsdocOuterTypeParameters1.types |   6 +-
 .../jsdocParameterParsingInfiniteLoop.types   |   2 +-
 .../jsdocResolveNameFailureInTypedef.types    |   4 +-
 .../baselines/reference/lambdaArgCrash.types  |   4 +-
 tests/baselines/reference/localTypes4.types   |   2 +-
 .../reference/missingTypeArguments1.types     |   8 +-
 .../reference/missingTypeArguments2.types     |  12 +-
 ...moduleAugmentationImportsAndExports2.types |   2 +-
 ...moduleAugmentationImportsAndExports3.types |   2 +-
 .../reference/moduleExportAssignment7.types   |  12 +-
 .../reference/moduleInTypePosition1.types     |   4 +-
 ...ropertyAccessAndArrowFunctionIndent1.types |   4 +-
 .../noTypeArgumentOnReturnType1.types         |   4 +-
 ...jectTypesIdentityWithCallSignatures3.types |  12 +-
 tests/baselines/reference/parser553699.types  |   2 +-
 .../parserArrowFunctionExpression10.types     |   8 +-
 .../parserArrowFunctionExpression17.types     |   4 +-
 ...rrantEqualsGreaterThanAfterFunction2.types |   2 +-
 .../parserErrorRecovery_ParameterList6.types  |   2 +-
 .../parserGenericsInTypeContexts1.types       |   4 +-
 .../parserGenericsInTypeContexts2.types       |   4 +-
 .../parserMissingLambdaOpenBrace1.types       |   2 +-
 .../reference/parserObjectType5.types         |   2 +-
 .../reference/parserObjectType6.types         |   2 +-
 .../reference/parserRealSource10.types        | 220 ++--
 .../reference/parserRealSource11.types        | 240 ++---
 .../reference/parserRealSource12.types        | 978 +++++++++---------
 .../reference/parserRealSource13.types        | 242 ++---
 .../reference/parserRealSource14.types        |  66 +-
 .../reference/parserRealSource5.types         |   4 +-
 .../reference/parserRealSource6.types         |  66 +-
 .../reference/parserRealSource7.types         |  70 +-
 .../reference/parserRealSource8.types         |  42 +-
 .../reference/parserRealSource9.types         |  72 +-
 .../parserUnterminatedGeneric1.types          |   2 +-
 .../parserUnterminatedGeneric2.types          |   2 +-
 .../reference/parserX_ArrowFunction1.types    |   4 +-
 tests/baselines/reference/parserharness.types | 180 ++--
 .../baselines/reference/parserindenter.types  | 138 +--
 .../reference/privacyImportParseErrors.types  |  16 +-
 ...tyAssignmentMergeWithInterfaceMethod.types |   8 +-
 .../recursiveClassReferenceTest.types         |   2 +-
 .../reference/recursiveMappedTypes.types      |   4 +-
 .../reference/recursiveTypeComparison2.types  |   2 +-
 .../reference/recursiveTypeRelations.types    |   2 +-
 .../reference/returnTypeTypeArguments.types   |  88 +-
 .../baselines/reference/sourceMapSample.types |   2 +-
 .../reference/staticInstanceResolution5.types |  10 +-
 ...staticMembersUsingClassTypeParameter.types |   6 +-
 ...ethodsReferencingClassTypeParameters.types |   2 +-
 .../reference/strictModeReservedWord.types    |   6 +-
 .../baselines/reference/thisTypeErrors.types  |  80 +-
 .../reference/typeGuardFunctionErrors.types   |   8 +-
 ...ameterUsedAsTypeParameterConstraint4.types |  14 +-
 .../typeParametersInStaticAccessors.types     |   6 +-
 .../typeParametersInStaticMethods.types       |   4 +-
 .../reference/typedefTagTypeResolution.types  |   4 +-
 .../reference/typeofInObjectLiteralType.types |   4 +-
 .../reference/undeclaredModuleError.types     |   4 +-
 .../reference/undefinedTypeArgument2.types    |   2 +-
 .../unknownSymbolInGenericReturnType.types    |   4 +-
 .../baselines/reference/unknownSymbols1.types |   2 +-
 ...ionsClassMemberImportTypeNodeParameter2.ts |   2 +-
 ...ionsClassMemberImportTypeNodeParameter4.ts |   2 +-
 101 files changed, 1551 insertions(+), 1551 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 67c121959f6da..eab4b7e8990df 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6068,13 +6068,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
          * Same as expressionOrTypeToTypeNodeHelper, but also checks if the expression can be syntactically typed.
          */
         function expressionOrTypeToTypeNode(context: NodeBuilderContext, expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean) {
-            const oldFlags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             if (expr && !(context.internalFlags & InternalNodeBuilderFlags.NoSyntacticPrinter)) {
                 syntacticNodeBuilder.serializeTypeOfExpression(expr, context, addUndefined);
             }
             context.internalFlags |= InternalNodeBuilderFlags.NoSyntacticPrinter;
             const result = expressionOrTypeToTypeNodeHelper(context, expr, type, addUndefined);
-            oldFlags.restore();
+            restoreFlags();
             return result;
         }
         function expressionOrTypeToTypeNodeHelper(context: NodeBuilderContext, expr: Expression | JsxAttributeValue | undefined, type: Type, addUndefined?: boolean) {
@@ -6195,11 +6195,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return context.encounteredError ? undefined : resultingNode;
         }
 
-        function saveFlags(context: NodeBuilderContext) {
+        function saveRestoreFlags(context: NodeBuilderContext) {
             const flags = context.flags;
             const internalFlags = context.internalFlags;
 
-            return { restore };
+            return restore;
 
             function restore() {
                 context.flags = flags;
@@ -6213,9 +6213,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         function typeToTypeNodeHelper(type: Type, context: NodeBuilderContext): TypeNode {
-            const savedFlags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             const typeNode = typeToTypeNodeWorker(type, context);
-            savedFlags.restore();
+            restoreFlags();
             return typeNode;
         }
 
@@ -6813,10 +6813,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     return typeToTypeNodeHelper(getIntersectionType(types), context);
                 }
 
-                const savedFlags = saveFlags(context);
+                const restoreFlags = saveRestoreFlags(context);
                 context.flags |= NodeBuilderFlags.InObjectTypeLiteral;
                 const members = createTypeNodesFromResolvedType(resolved);
-                savedFlags.restore();
+                restoreFlags();
                 const typeLiteralNode = factory.createTypeLiteralNode(members);
                 context.approximateLength += 2;
                 setEmitFlags(typeLiteralNode, (context.flags & NodeBuilderFlags.MultilineObjectLiterals) ? 0 : EmitFlags.SingleLine);
@@ -6897,10 +6897,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                             // the default outer type arguments), we don't show the group.
                             if (!rangeEquals(outerTypeParameters, typeArguments, start, i)) {
                                 const typeArgumentSlice = mapToTypeNodes(typeArguments.slice(start, i), context);
-                                const flags = saveFlags(context);
+                                const restoreFlags = saveRestoreFlags(context);
                                 context.flags |= NodeBuilderFlags.ForbidIndexedAccessSymbolReferences;
                                 const ref = symbolToTypeNode(parent, context, SymbolFlags.Type, typeArgumentSlice) as TypeReferenceNode | ImportTypeNode;
-                                flags.restore();
+                                restoreFlags();
                                 resultType = !resultType ? ref : appendReferenceToType(resultType, ref as TypeReferenceNode);
                             }
                         }
@@ -6940,10 +6940,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
                         typeArgumentNodes = mapToTypeNodes(typeArguments.slice(i, typeParameterCount), context);
                     }
-                    const flags = saveFlags(context);
+                    const restoreFlags = saveRestoreFlags(context);
                     context.flags |= NodeBuilderFlags.ForbidIndexedAccessSymbolReferences;
                     const finalRef = symbolToTypeNode(type.symbol, context, SymbolFlags.Type, typeArgumentNodes);
-                    flags.restore();
+                    restoreFlags();
                     return !resultType ? finalRef : appendReferenceToType(resultType, finalRef as TypeReferenceNode);
                 }
             }
@@ -7270,7 +7270,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     // once while referring to different types. If so, regenerate the
                     // type node for each entry by that name with the
                     // `UseFullyQualifiedType` flag enabled.
-                    const savedContextFlags = saveFlags(context);
+                    const restoreFlags = saveRestoreFlags(context);
                     context.flags |= NodeBuilderFlags.UseFullyQualifiedType;
                     seenNames.forEach(types => {
                         if (!arrayIsHomogeneous(types, ([a], [b]) => typesAreSameReference(a, b))) {
@@ -7279,7 +7279,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                             }
                         }
                     });
-                    savedContextFlags.restore();
+                    restoreFlags();
                 }
 
                 return result;
@@ -7339,7 +7339,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 typeParameters = signature.typeParameters && signature.typeParameters.map(parameter => typeParameterToDeclaration(parameter, context));
             }
 
-            const flags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             context.flags &= ~NodeBuilderFlags.SuppressAnyReturnType; // SuppressAnyReturnType should only apply to the signature `return` position
             // If the expanded parameter list had a variadic in a non-trailing position, don't expand it
             const parameters = (some(expandedParams, p => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & CheckFlags.RestParameter)) ? signature.parameters : expandedParams).map(parameter => symbolToParameterDeclaration(parameter, context, kind === SyntaxKind.Constructor));
@@ -7347,7 +7347,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             if (thisParameter) {
                 parameters.unshift(thisParameter);
             }
-            flags.restore();
+            restoreFlags();
 
             const returnTypeNode = serializeReturnTypeForSignature(context, signature);
 
@@ -7586,13 +7586,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         function typeParameterToDeclarationWithConstraint(type: TypeParameter, context: NodeBuilderContext, constraintNode: TypeNode | undefined): TypeParameterDeclaration {
-            const savedContextFlags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             context.flags &= ~NodeBuilderFlags.WriteTypeParametersInQualifiedName; // Avoids potential infinite loop when building for a claimspace with a generic
             const modifiers = factory.createModifiersFromModifierFlags(getTypeParameterModifiers(type));
             const name = typeParameterToName(type, context);
             const defaultParameter = getDefaultFromTypeParameter(type);
             const defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
-            savedContextFlags.restore();
+            restoreFlags();
             return factory.createTypeParameterDeclaration(modifiers, name, constraintNode, defaultParameterNode);
         }
 
@@ -8313,7 +8313,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         function serializeTypeForDeclaration(context: NodeBuilderContext, declaration: Declaration | undefined, type: Type, symbol: Symbol) {
             const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration);
             const enclosingDeclaration = context.enclosingDeclaration;
-            const oldFlags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             if (declaration && hasInferredType(declaration) && !(context.internalFlags & InternalNodeBuilderFlags.NoSyntacticPrinter)) {
                 syntacticNodeBuilder.serializeTypeOfDeclaration(declaration, context);
             }
@@ -8329,7 +8329,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     const addUndefined = addUndefinedForParameter || !!(symbol.flags & SymbolFlags.Property && symbol.flags & SymbolFlags.Optional && isOptionalDeclaration(declWithExistingAnnotation) && (symbol as MappedSymbol).links?.mappedType && containsNonMissingUndefinedType(type));
                     const result = !isTypePredicateNode(existing) && tryReuseExistingTypeNode(context, existing, type, declWithExistingAnnotation, addUndefined);
                     if (result) {
-                        oldFlags.restore();
+                        restoreFlags();
                         return result;
                     }
                 }
@@ -8345,7 +8345,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const expr = decl && isDeclarationWithPossibleInnerTypeNodeReuse(decl) ? getPossibleTypeNodeReuseExpression(decl) : undefined;
 
             const result = expressionOrTypeToTypeNode(context, expr, type, addUndefinedForParameter);
-            oldFlags.restore();
+            restoreFlags();
             return result;
         }
 
@@ -8361,7 +8361,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
         function serializeReturnTypeForSignature(context: NodeBuilderContext, signature: Signature) {
             const suppressAny = context.flags & NodeBuilderFlags.SuppressAnyReturnType;
-            const flags = saveFlags(context);
+            const restoreFlags = saveRestoreFlags(context);
             if (suppressAny) context.flags &= ~NodeBuilderFlags.SuppressAnyReturnType; // suppress only toplevel `any`s
             let returnTypeNode: TypeNode | undefined;
             const returnType = getReturnTypeOfSignature(signature);
@@ -8375,7 +8375,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             else if (!suppressAny) {
                 returnTypeNode = factory.createKeywordTypeNode(SyntaxKind.AnyKeyword);
             }
-            flags.restore();
+            restoreFlags();
             return returnTypeNode;
         }
 
@@ -9630,7 +9630,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 const typeParamDecls = map(typeParams, p => typeParameterToDeclaration(p, context));
                 const jsdocAliasDecl = symbol.declarations?.find(isJSDocTypeAlias);
                 const commentText = getTextOfJSDocComment(jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : undefined);
-                const oldFlags = saveFlags(context);
+                const restoreFlags = saveRestoreFlags(context);
                 context.flags |= NodeBuilderFlags.InTypeAlias;
                 const oldEnclosingDecl = context.enclosingDeclaration;
                 context.enclosingDeclaration = jsdocAliasDecl;
@@ -9645,7 +9645,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     ),
                     modifierFlags,
                 );
-                oldFlags.restore();
+                restoreFlags();
                 context.enclosingDeclaration = oldEnclosingDecl;
             }
 
@@ -10658,10 +10658,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
             function getNameCandidateWorker(symbol: Symbol, localName: string) {
                 if (localName === InternalSymbolName.Default || localName === InternalSymbolName.Class || localName === InternalSymbolName.Function) {
-                    const flags = saveFlags(context);
+                    const restoreFlags = saveRestoreFlags(context);
                     context.flags |= NodeBuilderFlags.InInitialEntityName;
                     const nameCandidate = getNameOfSymbolAsWritten(symbol, context);
-                    flags.restore();
+                    restoreFlags();
                     localName = nameCandidate.length > 0 && isSingleOrDoubleQuote(nameCandidate.charCodeAt(0)) ? stripQuotes(nameCandidate) : nameCandidate;
                 }
                 if (localName === InternalSymbolName.Default) {
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index e09f8bd56a272..96bd527077d8e 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -279,7 +279,7 @@ export class TypeWriterWalker {
             }
             else {
                 const typeFormatFlags = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.AllowUniqueESSymbolType | ts.TypeFormatFlags.GenerateNamesForShadowedTypeParams;
-                let typeNode = this.checker.typeToTypeNode(type, node.parent, (typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors)!;
+                let typeNode = this.checker.typeToTypeNode(type, node.parent, (typeFormatFlags & ts.TypeFormatFlags.NodeBuilderFlagsMask) | ts.NodeBuilderFlags.IgnoreErrors, ts.InternalNodeBuilderFlags.AllowUnresolvedNames)!;
                 if (ts.isIdentifier(node) && ts.isTypeAliasDeclaration(node.parent) && node.parent.name === node && ts.isIdentifier(typeNode) && ts.idText(typeNode) === ts.idText(node)) {
                     // for a complex type alias `type T = ...`, showing "T : T" isn't very helpful for type tests. When the type produced is the same as
                     // the name of the type alias, recreate the type string without reusing the alias name
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index b646290db6dee..a1b4a49cef7a9 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -393,7 +393,7 @@ export function createSignatureDeclarationFromSignature(
         | NodeBuilderFlags.SuppressAnyReturnType
         | NodeBuilderFlags.AllowEmptyTuple
         | (quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : NodeBuilderFlags.None);
-    const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration;
+    const signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, InternalNodeBuilderFlags.AllowUnresolvedNames, getNoopSymbolTrackerWithResolver(context)) as ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration;
     if (!signatureDeclaration) {
         return undefined;
     }
diff --git a/tests/baselines/reference/ArrowFunction1.types b/tests/baselines/reference/ArrowFunction1.types
index c0f36308a4c3a..e05ceb280edb9 100644
--- a/tests/baselines/reference/ArrowFunction1.types
+++ b/tests/baselines/reference/ArrowFunction1.types
@@ -3,9 +3,9 @@
 === ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>  : ^ ^^   ^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^^^^^^^^^^^^^
+>               : ^ ^^   ^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
index 3b9a05088c0b9..9bce00088aa1c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithModuleMemberThatUsesClassTypeParameter.types
@@ -22,7 +22,7 @@ module clodule1 {
 
     function f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index 23e3bcd89500f..e0920ba869bb1 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -38,16 +38,16 @@ function f() {
 
 interface I {
     method(args: typeof arguments): void;
->method : (args: any) => void
->       : ^    ^^^^^^^^^^    
+>method : (args: typeof arguments) => void
+>       : ^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
 >          : ^^^
 
     fn: (args: typeof arguments) => void;
->fn : (args: any) => void
->   : ^    ^^^^^^^^^^    
+>fn : (args: typeof arguments) => void
+>   : ^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
@@ -66,8 +66,8 @@ interface I {
 >          : ^^^
 
     construct: new (args: typeof arguments) => void;
->construct : new (args: any) => void
->          : ^^^^^    ^^^^^^^^^^    
+>construct : new (args: typeof arguments) => void
+>          : ^^^^^    ^^                ^^^^^    
 >args : any
 >     : ^^^
 >arguments : any
diff --git a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
index 1986b06942f71..3477e908a4412 100644
--- a/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
+++ b/tests/baselines/reference/arrayReferenceWithoutTypeArgs.types
@@ -6,8 +6,8 @@ class X {
 >  : ^
 
     public f(a: Array) { }
->f : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>f : (a: Array) => void
+>  : ^ ^^     ^^^^^^^^^
 >a : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
index 5c6b02e6e38ea..2059b6a1d0af5 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
index 82694aa672ecf..c67538371823d 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { };
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
index 1e9e5af30123a..b69055519df93 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es6.types
@@ -23,7 +23,7 @@ async function f1(): Promise<void> { }
 
 async function f3(): MyPromise<void> { }
 >f3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 let f4 = async function() { }
 >f4 : () => Promise<void>
@@ -39,9 +39,9 @@ let f5 = async function(): Promise<void> { }
 
 let f6 = async function(): MyPromise<void> { }
 >f6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async function(): MyPromise<void> { } : () => MyPromise<void>
->                                      : ^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^^^^^^               
 
 let f7 = async () => { };
 >f7 : () => Promise<void>
@@ -57,9 +57,9 @@ let f8 = async (): Promise<void> => { };
 
 let f9 = async (): MyPromise<void> => { }; 
 >f9 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 >async (): MyPromise<void> => { } : () => MyPromise<void>
->                                 : ^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^               
 
 let f10 = async () => p;
 >f10 : () => Promise<number>
@@ -87,17 +87,17 @@ let f12 = async (): Promise<number> => mp;
 
 let f13 = async (): MyPromise<number> => p;
 >f13 : () => MyPromise<number>
->    : ^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^                 
 >async (): MyPromise<number> => p : () => MyPromise<number>
->                                 : ^^^^^^^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^                 
 >p : Promise<number>
 >  : ^^^^^^^^^^^^^^^
 
 let o = {
 >o : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 >{	async m1() { },	async m2(): Promise<void> { },	async m3(): MyPromise<void> { }} : { m1(): Promise<void>; m2(): Promise<void>; m3(): MyPromise<void>; }
->                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^             ^^^^^^^^               ^^^
 
 	async m1() { },
 >m1 : () => Promise<void>
@@ -109,7 +109,7 @@ let o = {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 };
 
@@ -127,7 +127,7 @@ class C {
 
 	async m3(): MyPromise<void> { }
 >m3 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 
 	static async m4() { }
 >m4 : () => Promise<void>
@@ -139,7 +139,7 @@ class C {
 
 	static async m6(): MyPromise<void> { }
 >m6 : () => MyPromise<void>
->   : ^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^               
 }
 
 module M {
diff --git a/tests/baselines/reference/badExternalModuleReference.types b/tests/baselines/reference/badExternalModuleReference.types
index e2161d64ff872..755cfd5afa70b 100644
--- a/tests/baselines/reference/badExternalModuleReference.types
+++ b/tests/baselines/reference/badExternalModuleReference.types
@@ -7,7 +7,7 @@ import a1 = require("garbage");
 
 export declare var a: {
 >a : { (): a1.connectExport; test1: a1.connectModule; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^                ^^^^^^^^^                ^^^
 
     test1: a1.connectModule;
 >test1 : a1.connectModule
diff --git a/tests/baselines/reference/bluebirdStaticThis.types b/tests/baselines/reference/bluebirdStaticThis.types
index cc2b3a9a5c1c1..e090eac053745 100644
--- a/tests/baselines/reference/bluebirdStaticThis.types
+++ b/tests/baselines/reference/bluebirdStaticThis.types
@@ -147,7 +147,7 @@ export declare class Promise<R> implements Promise.Thenable<R> {
 
     static defer<R>(dit: typeof Promise): Promise.Resolver<R>;
 >defer : <R>(dit: typeof Promise) => Promise.Resolver<R>
->      : ^ ^^   ^^              ^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^ ^^   ^^              ^^^^^                   
 >dit : typeof Promise
 >    : ^^^^^^^^^^^^^^
 >Promise : typeof Promise
diff --git a/tests/baselines/reference/circularBaseTypes.types b/tests/baselines/reference/circularBaseTypes.types
index 9b237c0c33002..f15db1ed5a721 100644
--- a/tests/baselines/reference/circularBaseTypes.types
+++ b/tests/baselines/reference/circularBaseTypes.types
@@ -15,8 +15,8 @@ type M3 = M2[keyof M2];  // Error
 >   : ^^^
 
 function f(m: M3) {
->f : (m: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (m: M3) => any
+>  : ^ ^^  ^^^^^^^^
 >m : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/complicatedPrivacy.types b/tests/baselines/reference/complicatedPrivacy.types
index 4b8e2b93060cb..d9fd54eb04428 100644
--- a/tests/baselines/reference/complicatedPrivacy.types
+++ b/tests/baselines/reference/complicatedPrivacy.types
@@ -84,8 +84,8 @@ module m1 {
     }
 
     export function f4(arg1: 
->f4 : (arg1: {}) => void
->   : ^    ^^  ^^^^^^^^^
+>f4 : (arg1: { [number]: C1; }) => void
+>   : ^    ^^                 ^^^^^^^^^
 >arg1 : {}
 >     : ^^
     {
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index 07ec406a76ef9..1732ef9e66df6 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -859,11 +859,11 @@ module TypeScriptAllInOne {
 >xx.Foo() : bool
 >         : ^^^^
 >xx.Foo : () => bool
->       : ^^^^^^^^^^
+>       : ^^^^^^    
 >xx : IF
 >   : ^^
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
 >0 : 0
 >  : ^
 >1 : 1
@@ -1290,7 +1290,7 @@ module TypeScriptAllInOne {
     interface IF {
         Foo(): bool;
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
     }
 
     class CLASS implements IF {
@@ -1323,7 +1323,7 @@ module TypeScriptAllInOne {
         }
         public Foo(): bool {
 >Foo : () => bool
->    : ^^^^^^^^^^
+>    : ^^^^^^    
 
             var myEvent = () => { return 1; };
 >myEvent : () => number
diff --git a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
index ff27f866ca994..1e5e4b1c668a0 100644
--- a/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
+++ b/tests/baselines/reference/declarationEmitComputedPropertyNameEnum2.types
@@ -21,10 +21,10 @@ import { type Type } from "./type";
 >     : ^^^
 
 export const foo = { ...({} as Type) };
->foo : { x?: {}; }
->    : ^^^^^^  ^^^
->{ ...({} as Type) } : { x?: {}; }
->                    : ^^^^^^  ^^^
+>foo : { x?: { [Enum.A]: 0; }; }
+>    : ^^^^^^                ^^^
+>{ ...({} as Type) } : { x?: { [Enum.A]: 0; }; }
+>                    : ^^^^^^                ^^^
 >({} as Type) : Type
 >             : ^^^^
 >{} as Type : Type
diff --git a/tests/baselines/reference/errorsInGenericTypeReference.types b/tests/baselines/reference/errorsInGenericTypeReference.types
index 81f1035e5f2c0..c159268c6c1fe 100644
--- a/tests/baselines/reference/errorsInGenericTypeReference.types
+++ b/tests/baselines/reference/errorsInGenericTypeReference.types
@@ -45,9 +45,9 @@ class testClass2<T> {
 }
 var tc2 = new testClass2<{ x: V }>(); // error: could not find symbol V
 >tc2 : testClass2<{ x: V; }>
->    : ^^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^^^^^^^^^^^ ^^^^
 >new testClass2<{ x: V }>() : testClass2<{ x: V; }>
->                           : ^^^^^^^^^^^^^^^^^^^^^
+>                           : ^^^^^^^^^^^^^^^^ ^^^^
 >testClass2 : typeof testClass2
 >           : ^^^^^^^^^^^^^^^^^
 >x : V
@@ -73,15 +73,15 @@ class testClass3 {
 
     set a(value: Foo<{ x: V }>) { } // error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >value : Foo<{ x: V; }>
->      : ^^^^^^^^^^^^^^
+>      : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^^^^^^
+>         : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 }
@@ -100,7 +100,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 >testFunction2 : (p: Foo<{ x: V; }>) => void
 >              : ^ ^^              ^^^^^^^^^
 >p : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -108,7 +108,7 @@ function testFunction2(p: Foo<{ x: V }>) { }// error: could not find symbol V
 // in var type annotation
 var f: Foo<{ x: V }>; // error: could not find symbol V
 >f : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -149,7 +149,7 @@ class testClass7 extends Foo<{ x: V }> { } // error: could not find symbol V
 >testClass7 : testClass7
 >           : ^^^^^^^^^^
 >Foo : Foo<{ x: V; }>
->    : ^^^^^^^^^^^^^^
+>    : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 
@@ -166,7 +166,7 @@ class testClass8 implements IFoo<{ x: V }> { } // error: could not find symbol V
 interface testInterface2 {
     new (a: Foo<{ x: V }>): Foo<{ x: V }>; //2x: error: could not find symbol V
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 >x : V
@@ -182,7 +182,7 @@ interface testInterface2 {
 >method : (a: Foo<{ x: V; }>) => Foo<{ x: V; }>
 >       : ^ ^^              ^^^^^              
 >a : Foo<{ x: V; }>
->  : ^^^^^^^^^^^^^^
+>  : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 >x : V
@@ -190,7 +190,7 @@ interface testInterface2 {
 
     property: Foo<{ x: V }>; // error: could not find symbol V
 >property : Foo<{ x: V; }>
->         : ^^^^^^^^^^^^^^
+>         : ^^^^^^^^^ ^^^^
 >x : V
 >  : ^
 }
diff --git a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
index e92435770566b..03d26bb153cbd 100644
--- a/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
+++ b/tests/baselines/reference/experimentalDecoratorMetadataUnresolvedTypeObjectInEmit.types
@@ -17,7 +17,7 @@ class Foo {
 
     f(@decorate user: A.B.C.D.E): void {}
 >f : (user: A.B.C.D.E) => void
->  : ^    ^^^^^^^^^^^^^^^^    
+>  : ^    ^^         ^^^^^    
 >decorate : any
 >         : ^^^
 >user : A.B.C.D.E
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 1166e17b3ee19..45c953a6edaec 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -31,7 +31,7 @@ declare module "m2" {
 
     function Z2(): X.I;
 >Z2 : () => X.I
->   : ^^^^^^^^^
+>   : ^^^^^^   
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index 6479046c76e2e..7cfc7f29a1799 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -19,7 +19,7 @@ declare module "m" {
 
     export function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^^^^^^
+>    : ^^^^^^     
 >X : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
index 5bd8e94d07540..6abf489b85771 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.types
@@ -18,7 +18,7 @@ export declare function foo(): X.foo;
 
 export declare function bar(): X.bar; // error
 >bar : () => X.bar
->    : ^^^^^^^^^^^
+>    : ^^^^^^     
 >X : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/extendArray.types b/tests/baselines/reference/extendArray.types
index 4278407983217..0cc9fc76332e3 100644
--- a/tests/baselines/reference/extendArray.types
+++ b/tests/baselines/reference/extendArray.types
@@ -36,7 +36,7 @@ declare module _Core {
 >collect : (fn: (e: _element) => _element[]) => any[]
 >        : ^  ^^                           ^^^^^     
 >fn : (e: _element) => _element[]
->   : ^ ^^^^^^^^^^^^^^^          
+>   : ^ ^^        ^^^^^          
 >e : _element
 >  : ^^^^^^^^
   }
diff --git a/tests/baselines/reference/functionTypesLackingReturnTypes.types b/tests/baselines/reference/functionTypesLackingReturnTypes.types
index 1daafaa5f397a..eee1024a9b1d5 100644
--- a/tests/baselines/reference/functionTypesLackingReturnTypes.types
+++ b/tests/baselines/reference/functionTypesLackingReturnTypes.types
@@ -6,7 +6,7 @@ function f(x: ()) {
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^^^^
+>  : ^^^^^^   
 }
 
 // Error (no '=>')
diff --git a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
index e09690cad7040..a411dc6efcaa1 100644
--- a/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/functionVariableInReturnTypeAnnotation.types
@@ -2,8 +2,8 @@
 
 === functionVariableInReturnTypeAnnotation.ts ===
 function bar(): typeof b {
->bar : () => any
->    : ^^^^^^^^^
+>bar : () => typeof b
+>    : ^^^^^^        
 >b : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
index 6dfc4569d313d..09fe11a54013c 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.types
@@ -435,7 +435,7 @@ module TU {
 >x : T
 >  : ^
 >b : (x: U) => U
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^ 
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
index 94966b98ecdd6..673dd58110312 100644
--- a/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
+++ b/tests/baselines/reference/genericClassWithStaticsUsingTypeArguments.types
@@ -8,9 +8,9 @@ class Foo<T> {
 
     static a = (n: T) => { };
 >a : (n: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >(n: T) => { } : (n: T) => void
->              : ^ ^^^^^^^^^^^^
+>              : ^ ^^ ^^^^^^^^^
 >n : T
 >  : ^
 
@@ -34,9 +34,9 @@ class Foo<T> {
 >((x: T) => x || undefined)(null) : any
 >                                 : ^^^
 >((x: T) => x || undefined) : (x: T) => any
->                           : ^ ^^^^^^^^^^^
+>                           : ^ ^^ ^^^^^^^^
 >(x: T) => x || undefined : (x: T) => any
->                         : ^ ^^^^^^^^^^^
+>                         : ^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 >x || undefined : any
@@ -48,9 +48,9 @@ class Foo<T> {
 
     static e = function (x: T) { return null; }
 >e : (x: T) => any
->  : ^ ^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^
 >function (x: T) { return null; } : (x: T) => any
->                                 : ^ ^^^^^^^^^^^
+>                                 : ^ ^^ ^^^^^^^^
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
index 5d3d5fe11f6e9..7aad01faad3f2 100644
--- a/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
+++ b/tests/baselines/reference/genericLambaArgWithoutTypeArguments.types
@@ -19,8 +19,8 @@ foo((arg: Foo) => { return arg.x; });
 >                                     : ^^^
 >foo : (a: any) => any
 >    : ^ ^^^^^^^^^^^^^
->(arg: Foo) => { return arg.x; } : (arg: any) => any
->                                : ^   ^^^^^^^^^^^^^
+>(arg: Foo) => { return arg.x; } : (arg: Foo) => any
+>                                : ^   ^^   ^^^^^^^^
 >arg : any
 >    : ^^^
 >arg.x : any
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
index 7af45bae740c9..74f654b1a760e 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors3.types
@@ -10,8 +10,8 @@ module TypeScript {
 >           : ^^^^^^^^^^^^^^^^^^^
 
         static create<A,B,C>(arg1: any, arg2?: any, arg3?: any): MemberName {
->create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => any
->       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>create : <A, B, C>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>       : ^ ^^ ^^ ^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >arg1 : any
 >     : ^^^
 >arg2 : any
@@ -45,8 +45,8 @@ module TypeScript {
 >             : ^^^
 
         public toString<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) {
->toString : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean) => any
->         : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^^^^^^^
+>toString : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean) => any
+>         : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -61,12 +61,12 @@ module TypeScript {
 >                                                                : ^^^
 >this.getScopedNameEx(scopeSymbol, useConstraintInName) : any
 >                                                       : ^^^
->this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                     : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>this.getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                     : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >this : this
 >     : ^^^^
->getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^^^^^^^^^^^^^^^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A_1, B_1, C_1>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^^^^^^^^^^^^^^^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -79,8 +79,8 @@ module TypeScript {
 >  : ^^^
         }
         public getScopedNameEx<A,B,C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) {
->getScopedNameEx : <A, B, C>(scopeSymbol?: any, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
->                : ^ ^^ ^^ ^^           ^^^^^^^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
+>getScopedNameEx : <A, B, C>(scopeSymbol?: PullSymbol, useConstraintInName?: boolean, getPrettyTypeName?: boolean, getTypeParamMarkerInfo?: boolean) => any
+>                : ^ ^^ ^^ ^^           ^^^          ^^                   ^^^       ^^                 ^^^       ^^                      ^^^       ^^^^^^^^
 >scopeSymbol : any
 >            : ^^^
 >useConstraintInName : boolean
@@ -191,12 +191,12 @@ module TypeScript {
                 return MemberName.create(elementMemberName, "", "[]");
 >MemberName.create(elementMemberName, "", "[]") : any
 >                                               : ^^^
->MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
->                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>MemberName.create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>                  : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >MemberName : typeof MemberName
 >           : ^^^^^^^^^^^^^^^^^
->create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => any
->       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^^^^
+>create : <A_1, B_1, C_1>(arg1: any, arg2?: any, arg3?: any) => MemberName
+>       : ^^^^^^^^^^^^^^^^    ^^   ^^    ^^^   ^^    ^^^   ^^^^^          
 >elementMemberName : any
 >                  : ^^^
 >"" : ""
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
index b8d61e618b3d4..7d12f8b399ff6 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.d.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
index 428b8ad4ca384..b289f43a0a8db 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument.types
@@ -18,14 +18,14 @@ var c: C;
 >  : ^^^
 
 var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,10 +36,10 @@ var d: { [x: C]: C };
 >  : ^^^
 
 var e = (x: C) => { var y: C; return y; }
->e : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->(x: C) => { var y: C; return y; } : (x: any) => any
->                                  : ^ ^^^^^^^^^^^^^
+>e : (x: C) => any
+>  : ^ ^^ ^^^^^^^^
+>(x: C) => { var y: C; return y; } : (x: C) => any
+>                                  : ^ ^^ ^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -48,8 +48,8 @@ var e = (x: C) => { var y: C; return y; }
 >  : ^^^
 
 function f(x: C): C { var y: C; return y; }
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
@@ -58,12 +58,12 @@ function f(x: C): C { var y: C; return y; }
 >  : ^^^
 
 var g = function f(x: C): C { var y: C; return y; }
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->function f(x: C): C { var y: C; return y; } : (x: any) => any
->                                            : ^ ^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: C) => C
+>  : ^ ^^ ^^^^^ 
+>function f(x: C): C { var y: C; return y; } : (x: C) => C
+>                                            : ^ ^^ ^^^^^ 
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
index d618ec2c442c3..02c324df4a2ba 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument2.types
@@ -15,14 +15,14 @@ var c: I;
 >  : ^^^
 
 var a: { x: I };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: I; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 var b: { (x: I): I };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -33,10 +33,10 @@ var d: { [x: I]: I };
 >  : ^^^
 
 var e = (x: I) => { var y: I; return y; }
->e : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->(x: I) => { var y: I; return y; } : (x: any) => any
->                                  : ^ ^^^^^^^^^^^^^
+>e : (x: I) => any
+>  : ^ ^^ ^^^^^^^^
+>(x: I) => { var y: I; return y; } : (x: I) => any
+>                                  : ^ ^^ ^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -45,8 +45,8 @@ var e = (x: I) => { var y: I; return y; }
 >  : ^^^
 
 function f(x: I): I { var y: I; return y; }
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
@@ -55,12 +55,12 @@ function f(x: I): I { var y: I; return y; }
 >  : ^^^
 
 var g = function f(x: I): I { var y: I; return y; }
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
->function f(x: I): I { var y: I; return y; } : (x: any) => any
->                                            : ^ ^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: I) => I
+>  : ^ ^^ ^^^^^ 
+>function f(x: I): I { var y: I; return y; } : (x: I) => I
+>                                            : ^ ^^ ^^^^^ 
+>f : (x: I) => I
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 >y : any
diff --git a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
index 65c8e58e17514..1b4e7fc2df006 100644
--- a/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
+++ b/tests/baselines/reference/genericTypeReferenceWithoutTypeArgument3.types
@@ -18,14 +18,14 @@ declare var c: C;
 >  : ^^^
 
 declare var a: { x: C };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: C; }
+>  : ^^^^^ ^^^
 >x : any
 >  : ^^^
 
 declare var b: { (x: C): C };
->b : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>b : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
@@ -36,8 +36,8 @@ declare var d: { [x: C]: C };
 >  : ^^^
 
 declare function f(x: C): C;
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>f : (x: C) => C
+>  : ^ ^^ ^^^^^ 
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/genericsWithoutTypeParameters1.types b/tests/baselines/reference/genericsWithoutTypeParameters1.types
index 37257696d399b..d53f00d368de8 100644
--- a/tests/baselines/reference/genericsWithoutTypeParameters1.types
+++ b/tests/baselines/reference/genericsWithoutTypeParameters1.types
@@ -33,8 +33,8 @@ var i2: I<C>;
 >   : ^^^^^^
 
 function foo(x: C, y: I) { }
->foo : (x: any, y: any) => void
->    : ^ ^^^^^^^ ^^^^^^^^^^^^^^
+>foo : (x: C, y: I) => void
+>    : ^ ^^ ^^ ^^ ^^^^^^^^^
 >x : any
 >  : ^^^
 >y : any
@@ -49,8 +49,8 @@ function foo2(x: C<I>, y: I<C>) { }
 >  : ^^^^^^
 
 var x: { a: C } = { a: new C<number>() };
->x : { a: any; }
->  : ^^^^^^^^^^^
+>x : { a: C; }
+>  : ^^^^^ ^^^
 >a : any
 >  : ^^^
 >{ a: new C<number>() } : { a: C<number>; }
@@ -63,8 +63,8 @@ var x: { a: C } = { a: new C<number>() };
 >  : ^^^^^^^^
 
 var x2: { a: I } = { a: { bar() { return 1 } } };
->x2 : { a: any; }
->   : ^^^^^^^^^^^
+>x2 : { a: I; }
+>   : ^^^^^ ^^^
 >a : any
 >  : ^^^
 >{ a: { bar() { return 1 } } } : { a: { bar(): number; }; }
@@ -106,8 +106,8 @@ class A<T> { }
 >  : ^^^^
 
 function f<T>(x: T): A {
->f : <T>(x: T) => any
->  : ^ ^^ ^^ ^^^^^^^^
+>f : <T>(x: T) => A
+>  : ^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/importTypeGeneric.types b/tests/baselines/reference/importTypeGeneric.types
index 80bda6bda5986..89f99fcf06016 100644
--- a/tests/baselines/reference/importTypeGeneric.types
+++ b/tests/baselines/reference/importTypeGeneric.types
@@ -14,8 +14,8 @@ export interface Foo {
 }
 === usage.ts ===
 export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
->getFooFrom : <T extends "./a" | "./b">(v: T) => any
->           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
+>getFooFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo
+>           : ^ ^^^^^^^^^             ^^ ^^ ^^^^^             
 >v : T
 >  : ^
 
@@ -27,8 +27,8 @@ export function getFooFrom<T extends "./a" | "./b">(v: T): import(T).Foo {
 }
 
 export function getFooValueFrom<T extends "./a" | "./b">(v: T): import(T).Foo["a"] {
->getFooValueFrom : <T extends "./a" | "./b">(v: T) => any
->                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^^^^
+>getFooValueFrom : <T extends "./a" | "./b">(v: T) => import(T).Foo["a"]
+>                : ^ ^^^^^^^^^             ^^ ^^ ^^^^^                  
 >v : T
 >  : ^
 
diff --git a/tests/baselines/reference/importedModuleAddToGlobal.types b/tests/baselines/reference/importedModuleAddToGlobal.types
index 4595882098610..f935bc74710e4 100644
--- a/tests/baselines/reference/importedModuleAddToGlobal.types
+++ b/tests/baselines/reference/importedModuleAddToGlobal.types
@@ -44,7 +44,7 @@ module C {
 
     function hello(): b.B { return null; }
 >hello : () => b.B
->      : ^^^^^^^^^
+>      : ^^^^^^   
 >b : any
 >  : ^^^
 }
diff --git a/tests/baselines/reference/intrinsicKeyword.types b/tests/baselines/reference/intrinsicKeyword.types
index 992bddd32605f..ae043729da5d0 100644
--- a/tests/baselines/reference/intrinsicKeyword.types
+++ b/tests/baselines/reference/intrinsicKeyword.types
@@ -7,7 +7,7 @@ let e1: intrinsic;
 
 let e2: { intrinsic: intrinsic };
 >e2 : { intrinsic: intrinsic; }
->   : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^^^^^^^^         ^^^
 >intrinsic : intrinsic
 >          : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
index cc6fd4db7284d..cbfbd71f3ce4b 100644
--- a/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
+++ b/tests/baselines/reference/jsdocFunctionTypeFalsePositive.types
@@ -6,5 +6,5 @@ function f(x) {}
 >f : (x: () => any) => void
 >  : ^ ^^         ^^^^^^^^^
 >x : () => any
->  : ^^^^^^^^^
+>  : ^^^^^^   
 
diff --git a/tests/baselines/reference/jsdocOuterTypeParameters1.types b/tests/baselines/reference/jsdocOuterTypeParameters1.types
index 104c89b19a52e..e09bc426c3e91 100644
--- a/tests/baselines/reference/jsdocOuterTypeParameters1.types
+++ b/tests/baselines/reference/jsdocOuterTypeParameters1.types
@@ -4,9 +4,9 @@
 /** @return {T} */
 const dedupingMixin = function(mixin) {};
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^^
+>              : ^     ^^^^^^^^^^ 
 >function(mixin) {} : (mixin: any) => T
->                   : ^     ^^^^^^^^^^^
+>                   : ^     ^^^^^^^^^^ 
 >mixin : any
 >      : ^^^
 
@@ -17,7 +17,7 @@ const PropertyAccessors = dedupingMixin(() => {
 >dedupingMixin(() => {  class Bar {    static bar() { this.prototype.foo(); }  }}) : T
 >                                                                                  : ^
 >dedupingMixin : (mixin: any) => T
->              : ^     ^^^^^^^^^^^
+>              : ^     ^^^^^^^^^^ 
 >() => {  class Bar {    static bar() { this.prototype.foo(); }  }} : () => void
 >                                                                   : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
index 60aba05e6ac88..03e0733209e4e 100644
--- a/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
+++ b/tests/baselines/reference/jsdocParameterParsingInfiniteLoop.types
@@ -7,5 +7,5 @@
  */
 let x;
 >x : (arg0: any, arg1: foo) => any
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^   ^^^^^^^^   ^^^^^^^^
 
diff --git a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
index 7e9a79fe8921a..fa4c2be52ec06 100644
--- a/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
+++ b/tests/baselines/reference/jsdocResolveNameFailureInTypedef.types
@@ -5,8 +5,8 @@
  * @param {Ty} x
  */
 function f(x) {}
->f : (x: CantResolveThis) => void
->  : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>f : (x: Ty) => void
+>  : ^ ^^  ^^^^^^^^^
 >x : CantResolveThis
 >  : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/lambdaArgCrash.types b/tests/baselines/reference/lambdaArgCrash.types
index b04d53e722cd8..2905a3006e235 100644
--- a/tests/baselines/reference/lambdaArgCrash.types
+++ b/tests/baselines/reference/lambdaArgCrash.types
@@ -69,7 +69,7 @@ class ItemSetEvent extends Event {
 >add : (listener: (items: ItemSet) => void) => void
 >    : ^        ^^                        ^^^^^^^^^
 >listener : (items: ItemSet) => void
->         : ^     ^^^^^^^^^^^^^^    
+>         : ^     ^^       ^^^^^    
 >items : ItemSet
 >      : ^^^^^^^
 
@@ -83,7 +83,7 @@ class ItemSetEvent extends Event {
 >add : (listener: () => any) => void
 >    : ^        ^^         ^^^^^    
 >listener : (items: ItemSet) => void
->         : ^     ^^^^^^^^^^^^^^    
+>         : ^     ^^       ^^^^^    
 
 	}
 
diff --git a/tests/baselines/reference/localTypes4.types b/tests/baselines/reference/localTypes4.types
index 276995eccc15c..bab7b13a03a3b 100644
--- a/tests/baselines/reference/localTypes4.types
+++ b/tests/baselines/reference/localTypes4.types
@@ -25,7 +25,7 @@ function f2() {
     // Local types are not in scope in parameters and return types
     function f(x: T): T {
 >f : (x: T) => T
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^ 
 >x : T
 >  : ^
 
diff --git a/tests/baselines/reference/missingTypeArguments1.types b/tests/baselines/reference/missingTypeArguments1.types
index 7674a030f35cc..4c52121e6efdb 100644
--- a/tests/baselines/reference/missingTypeArguments1.types
+++ b/tests/baselines/reference/missingTypeArguments1.types
@@ -11,8 +11,8 @@ class X<T> {
 >  : ^^^^
 
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 }
 var a: X<number>;
 >a : X<number>
@@ -73,8 +73,8 @@ class X6<T> {
 >   : ^^^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 }
 var a6: X6<number>;
 >a6 : X6<number>
diff --git a/tests/baselines/reference/missingTypeArguments2.types b/tests/baselines/reference/missingTypeArguments2.types
index c5c87c749a5ef..7e209f39c7ca0 100644
--- a/tests/baselines/reference/missingTypeArguments2.types
+++ b/tests/baselines/reference/missingTypeArguments2.types
@@ -6,12 +6,12 @@ class A<T> { }
 >  : ^^^^
 
 var x: () => A;
->x : () => any
->  : ^^^^^^^^^
+>x : () => A
+>  : ^^^^^^ 
 
 (a: A) => { };
->(a: A) => { } : (a: any) => void
->              : ^ ^^^^^^^^^^^^^^
+>(a: A) => { } : (a: A) => void
+>              : ^ ^^ ^^^^^^^^^
 >a : any
 >  : ^^^
 
@@ -20,6 +20,6 @@ var y: A<A>;
 >  : ^^^^^^
 
 (): A => null;
->(): A => null : () => any
->              : ^^^^^^^^^
+>(): A => null : () => A
+>              : ^^^^^^ 
 
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index 088b4523199a2..f120426e0aa12 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -80,7 +80,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^^
+>    : ^^^^^^ 
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index 8e0116c6d7fe1..17d9fc3f6e23e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -75,7 +75,7 @@ declare module "./f1" {
     interface A {
         foo(): B;
 >foo : () => B
->    : ^^^^^^^
+>    : ^^^^^^ 
 
         bar(): I;
 >bar : () => I
diff --git a/tests/baselines/reference/moduleExportAssignment7.types b/tests/baselines/reference/moduleExportAssignment7.types
index 2ccb64f0d5d12..4124a6d377230 100644
--- a/tests/baselines/reference/moduleExportAssignment7.types
+++ b/tests/baselines/reference/moduleExportAssignment7.types
@@ -159,8 +159,8 @@ function jstypes(a, b, c, d, e, f, g) {
  * @param {typeof import("./mod").literal} g
  */
 function jsvalues(a, b, c, d, e, f, g) {
->jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
->         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
+>jsvalues : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
+>         : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
 >a : typeof Thing
 >  : ^^^^^^^^^^^^
 >b : typeof AnotherThing
@@ -227,8 +227,8 @@ function jsvalues(a, b, c, d, e, f, g) {
 
 === index.ts ===
 function types(
->types : (a: any, b: any, c: any, d: any, e: any, f: import("./mod").buz, g: any) => any
->      : ^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^^^^^^ ^^                   ^^ ^^^^^^^^^^^^^
+>types : (a: import("./mod").Thing, b: import("./mod").AnotherThing, c: import("./mod").foo, d: import("./mod").qux, e: import("./mod").baz, f: import("./mod").buz, g: import("./mod").literal) => any
+>      : ^ ^^                     ^^ ^^                            ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                   ^^ ^^                       ^^^^^^^^
 
     a: import('./mod').Thing,
 >a : any
@@ -309,8 +309,8 @@ function types(
 }
 
 function values(
->values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: any, g: typeof import("./mod").literal) => any
->       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^^^^^^ ^^                              ^^^^^^^^
+>values : (a: typeof import("./mod").Thing, b: typeof import("./mod").AnotherThing, c: typeof import("./mod").foo, d: typeof import("./mod").qux, e: typeof import("./mod").baz, f: typeof import("./mod").buz, g: typeof import("./mod").literal) => any
+>       : ^ ^^                            ^^ ^^                                   ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                          ^^ ^^                              ^^^^^^^^
 
     a: typeof import('./mod').Thing,
 >a : typeof Thing
diff --git a/tests/baselines/reference/moduleInTypePosition1.types b/tests/baselines/reference/moduleInTypePosition1.types
index 54a4064d3a58d..893230662904c 100644
--- a/tests/baselines/reference/moduleInTypePosition1.types
+++ b/tests/baselines/reference/moduleInTypePosition1.types
@@ -8,9 +8,9 @@ import WinJS = require('./moduleInTypePosition1_0');
 
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^^^^^^^^^^^^^^^
+>                   : ^  ^^     ^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
index 689b28d1d837e..ab36f42fb2ec6 100644
--- a/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
+++ b/tests/baselines/reference/multiLinePropertyAccessAndArrowFunctionIndent1.types
@@ -21,7 +21,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(role: Role) =>        this.roleService.add(role)            .then((data: ng.IHttpPromiseCallbackArg<Role>) => data.data) : (role: Role) => any
->                                                                                                                          : ^    ^^^^^^^^^^^^^^
+>                                                                                                                          : ^    ^^    ^^^^^^^^
 >role : Role
 >     : ^^^^
 
@@ -49,7 +49,7 @@ return this.edit(role)
 >then : any
 >     : ^^^
 >(data: ng.IHttpPromiseCallbackArg<Role>) => data.data : (data: ng.IHttpPromiseCallbackArg<Role>) => any
->                                                      : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                      : ^    ^^                                ^^^^^^^^
 >data : ng.IHttpPromiseCallbackArg<Role>
 >     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >ng : any
diff --git a/tests/baselines/reference/noTypeArgumentOnReturnType1.types b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
index 11c001306ea4f..aa78989a9c06c 100644
--- a/tests/baselines/reference/noTypeArgumentOnReturnType1.types
+++ b/tests/baselines/reference/noTypeArgumentOnReturnType1.types
@@ -6,8 +6,8 @@ class A<T>{
 >  : ^^^^
  
  foo(): A{
->foo : () => any
->    : ^^^^^^^^^
+>foo : () => A
+>    : ^^^^^^ 
 
   return null;
  }
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
index 9e3db23d9d6c5..e5b849c6a2add 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures3.types
@@ -62,24 +62,24 @@ function foo3(x: any) { }
 >  : ^^^
 
 function foo4(x: typeof b);
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: typeof b); // error
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 >b : any
 >  : ^^^
 
 function foo4(x: any) { }
->foo4 : { (x: any): any; (x: any): any; }
->     : ^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+>foo4 : { (x: typeof b): any; (x: typeof b): any; }
+>     : ^^^ ^^        ^^^^^^^^^ ^^        ^^^^^^^^^
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/parser553699.types b/tests/baselines/reference/parser553699.types
index 8fb75c3898941..fcc70394c1163 100644
--- a/tests/baselines/reference/parser553699.types
+++ b/tests/baselines/reference/parser553699.types
@@ -8,7 +8,7 @@ class Foo {
   constructor() { }
   public banana (x: public) { }
 >banana : (x: public) => void
->       : ^ ^^^^^^^^^^^^^^^^^
+>       : ^ ^^      ^^^^^^^^^
 >x : public
 >  : ^^^^^^
 }
diff --git a/tests/baselines/reference/parserArrowFunctionExpression10.types b/tests/baselines/reference/parserArrowFunctionExpression10.types
index 0b639062c960d..bc288ad26b247 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression10.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression10.types
@@ -3,11 +3,11 @@
 === fileJs.js ===
 a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colon
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^^
+>                            : ^ ^^^^^^^^^^ 
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^^
+>               : ^ ^^^^^^^^^^ 
 >b : any
 >  : ^^^
 >(d) : any
@@ -24,11 +24,11 @@ a ? (b) : c => (d) : e => f // Not legal JS; "Unexpected token ':'" at last colo
 === fileTs.ts ===
 a ? (b) : c => (d) : e => f
 >a ? (b) : c => (d) : e => f : (b: any) => c
->                            : ^ ^^^^^^^^^^^
+>                            : ^ ^^^^^^^^^^ 
 >a : any
 >  : ^^^
 >(b) : c => (d) : (b: any) => c
->               : ^ ^^^^^^^^^^^
+>               : ^ ^^^^^^^^^^ 
 >b : any
 >  : ^^^
 >(d) : any
diff --git a/tests/baselines/reference/parserArrowFunctionExpression17.types b/tests/baselines/reference/parserArrowFunctionExpression17.types
index 44f811dbf5975..72350d6f59991 100644
--- a/tests/baselines/reference/parserArrowFunctionExpression17.types
+++ b/tests/baselines/reference/parserArrowFunctionExpression17.types
@@ -9,7 +9,7 @@ a ? b : (c) : d => e // Not legal JS; "Unexpected token ':'" at last colon
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^^
+>             : ^ ^^^^^^^^^^ 
 >c : any
 >  : ^^^
 >e : any
@@ -24,7 +24,7 @@ a ? b : (c) : d => e
 >b : any
 >  : ^^^
 >(c) : d => e : (c: any) => d
->             : ^ ^^^^^^^^^^^
+>             : ^ ^^^^^^^^^^ 
 >c : any
 >  : ^^^
 >e : any
diff --git a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
index c081e3e394ad1..b1e08f535a2e3 100644
--- a/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
+++ b/tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.types
@@ -3,7 +3,7 @@
 === parserErrantEqualsGreaterThanAfterFunction2.ts ===
 function f(p: A) => p;
 >f : (p: A) => any
->  : ^ ^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^
 >p : A
 >  : ^
 >p : any
diff --git a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
index 72675341e2934..938154e596aeb 100644
--- a/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
+++ b/tests/baselines/reference/parserErrorRecovery_ParameterList6.types
@@ -7,7 +7,7 @@ class Foo {
 
     public banana (x: break) { }
 >banana : (x: break) => void
->       : ^ ^^^^^^^^^^^^^^^^
+>       : ^ ^^     ^^^^^^^^^
 >x : break
 >  : ^^^^^
 }
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts1.types b/tests/baselines/reference/parserGenericsInTypeContexts1.types
index 6845b6326233c..35f7edf331487 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts1.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts1.types
@@ -37,14 +37,14 @@ var v6: K<T>[];
 
 function f1(a: E<T>) {
 >f1 : (a: E<T>) => void
->   : ^ ^^^^^^^^^^^^^^^
+>   : ^ ^^    ^^^^^^^^^
 >a : E<T>
 >  : ^^^^
 }
 
 function f2(): F<T> {
 >f2 : () => F<T>
->   : ^^^^^^^^^^
+>   : ^^^^^^    
 }
 
 
diff --git a/tests/baselines/reference/parserGenericsInTypeContexts2.types b/tests/baselines/reference/parserGenericsInTypeContexts2.types
index 928bcee3118b6..98fe0538ca6f5 100644
--- a/tests/baselines/reference/parserGenericsInTypeContexts2.types
+++ b/tests/baselines/reference/parserGenericsInTypeContexts2.types
@@ -37,14 +37,14 @@ var v6: K<X<T>, Y<Z<T>>>[];
 
 function f1(a: E<X<T>, Y<Z<T>>>) {
 >f1 : (a: E<X<T>, Y<Z<T>>>) => void
->   : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>   : ^ ^^                ^^^^^^^^^
 >a : E<X<T>, Y<Z<T>>>
 >  : ^^^^^^^^^^^^^^^^
 }
 
 function f2(): F<X<T>, Y<Z<T>>> {
 >f2 : () => F<X<T>, Y<Z<T>>>
->   : ^^^^^^^^^^^^^^^^^^^^^^
+>   : ^^^^^^                
 }
 
 
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
index e1c3c66d02847..1745d213e848e 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.types
@@ -7,7 +7,7 @@ class C {
 
     where(filter: Iterator<T, boolean>): Query<T> {
 >where : (filter: Iterator<T, boolean>) => Query<T>
->      : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^      ^^                    ^^^^^        
 >filter : Iterator<T, boolean>
 >       : ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserObjectType5.types b/tests/baselines/reference/parserObjectType5.types
index 620abab9f30ff..fe93d5cf1efd4 100644
--- a/tests/baselines/reference/parserObjectType5.types
+++ b/tests/baselines/reference/parserObjectType5.types
@@ -3,7 +3,7 @@
 === parserObjectType5.ts ===
 var v: {
 >v : { <T>(): any; A: B; }
->  : ^^^ ^^^^^^^^^^^^^^^^^
+>  : ^^^ ^^^^^^^^^^^^^ ^^^
 
    A: B
 >A : B
diff --git a/tests/baselines/reference/parserObjectType6.types b/tests/baselines/reference/parserObjectType6.types
index 990045de90b02..9d487d9bbee74 100644
--- a/tests/baselines/reference/parserObjectType6.types
+++ b/tests/baselines/reference/parserObjectType6.types
@@ -3,7 +3,7 @@
 === parserObjectType6.ts ===
 var v: {
 >v : { a: B; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 
    a: B
 >a : B
diff --git a/tests/baselines/reference/parserRealSource10.types b/tests/baselines/reference/parserRealSource10.types
index d81700003e0da..3ba5196d8a27d 100644
--- a/tests/baselines/reference/parserRealSource10.types
+++ b/tests/baselines/reference/parserRealSource10.types
@@ -886,7 +886,7 @@ module TypeScript {
 
     function setTokenInfo(tokenId: TokenID, reservation: number, binopPrecedence: number,
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >tokenId : TokenID
 >        : ^^^^^^^
 >reservation : number
@@ -1015,7 +1015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Any, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "any", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Any : TokenID.Any
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1065,7 +1065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bool, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "boolean", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Bool : TokenID.Bool
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1115,7 +1115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Break, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "break", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Break : TokenID.Break
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1165,7 +1165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Case, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "case", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Case : TokenID.Case
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1215,7 +1215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Catch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "catch", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Catch : TokenID.Catch
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1265,7 +1265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Class, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "class", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Class : TokenID.Class
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1315,7 +1315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Const, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "const", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Const : TokenID.Const
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1365,7 +1365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Continue, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "continue", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Continue : TokenID.Continue
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1415,7 +1415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Debugger, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.Debugger, "debugger", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Debugger : TokenID.Debugger
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1465,7 +1465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Default, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "default", ErrorRecoverySet.SCase) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Default : TokenID.Default
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1515,7 +1515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Delete, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Delete, "delete", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Delete : TokenID.Delete
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1565,7 +1565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Do, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "do", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Do : TokenID.Do
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1615,7 +1615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Else, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "else", ErrorRecoverySet.Else) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Else : TokenID.Else
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1665,7 +1665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Enum, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "enum", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Enum : TokenID.Enum
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1715,7 +1715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Export, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "export", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Export : TokenID.Export
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1765,7 +1765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Extends, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "extends", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Extends : TokenID.Extends
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1815,7 +1815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Declare, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "declare", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Declare : TokenID.Declare
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1865,7 +1865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.False, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "false", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.False : TokenID.False
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1915,7 +1915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Finally, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "finally", ErrorRecoverySet.Catch) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Finally : TokenID.Finally
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -1965,7 +1965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.For, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "for", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.For : TokenID.For
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2015,7 +2015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Function, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "function", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Function : TokenID.Function
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2065,7 +2065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Constructor, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "constructor", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Constructor : TokenID.Constructor
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2115,7 +2115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Get, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "get", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Get : TokenID.Get
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2165,7 +2165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Set, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "set", ErrorRecoverySet.Func) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Set : TokenID.Set
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2215,7 +2215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.If, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "if", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.If : TokenID.If
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2265,7 +2265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Implements, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "implements", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Implements : TokenID.Implements
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2315,7 +2315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Import, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "import", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Import : TokenID.Import
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2365,7 +2365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.In, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.In, OperatorPrecedence.None, NodeType.None, "in", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.In : TokenID.In
 >           : ^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2415,7 +2415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.InstanceOf, Reservation.TypeScriptAndJS, OperatorPrecedence.Relational, NodeType.InstOf, OperatorPrecedence.None, NodeType.None, "instanceof", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.InstanceOf : TokenID.InstanceOf
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2465,7 +2465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Interface, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "interface", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Interface : TokenID.Interface
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2515,7 +2515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Let, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "let", ErrorRecoverySet.None) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Let : TokenID.Let
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2565,7 +2565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Module, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "module", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Module : TokenID.Module
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2615,7 +2615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.New, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "new", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.New : TokenID.New
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2665,7 +2665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Number, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "number", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Number : TokenID.Number
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2715,7 +2715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Null, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "null", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Null : TokenID.Null
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2765,7 +2765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Package, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "package", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Package : TokenID.Package
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2815,7 +2815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Private, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "private", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Private : TokenID.Private
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2865,7 +2865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Protected, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "protected", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Protected : TokenID.Protected
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2915,7 +2915,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Public, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "public", ErrorRecoverySet.TypeScriptS) : void
 >                                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Public : TokenID.Public
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -2965,7 +2965,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Return, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "return", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Return : TokenID.Return
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3015,7 +3015,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Static, Reservation.TypeScriptAndJSFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "static", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Static : TokenID.Static
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3065,7 +3065,7 @@ module TypeScript {
 >setTokenInfo(TokenID.String, Reservation.TypeScript, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "string", ErrorRecoverySet.PrimType) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.String : TokenID.String
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3115,7 +3115,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Super, Reservation.TypeScriptAndJSFuture, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "super", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Super : TokenID.Super
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3165,7 +3165,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Switch, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "switch", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Switch : TokenID.Switch
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3215,7 +3215,7 @@ module TypeScript {
 >setTokenInfo(TokenID.This, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "this", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.This : TokenID.This
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3265,7 +3265,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Throw, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "throw", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Throw : TokenID.Throw
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3315,7 +3315,7 @@ module TypeScript {
 >setTokenInfo(TokenID.True, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "true", ErrorRecoverySet.RLit) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.True : TokenID.True
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3365,7 +3365,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Try, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "try", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Try : TokenID.Try
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3415,7 +3415,7 @@ module TypeScript {
 >setTokenInfo(TokenID.TypeOf, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Typeof, "typeof", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.TypeOf : TokenID.TypeOf
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3465,7 +3465,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Var, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "var", ErrorRecoverySet.Var) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Var : TokenID.Var
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3515,7 +3515,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Void, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Void, "void", ErrorRecoverySet.Prefix) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Void : TokenID.Void
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3565,7 +3565,7 @@ module TypeScript {
 >setTokenInfo(TokenID.With, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.With, "with", ErrorRecoverySet.Stmt) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.With : TokenID.With
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3615,7 +3615,7 @@ module TypeScript {
 >setTokenInfo(TokenID.While, Reservation.TypeScriptAndJS, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "while", ErrorRecoverySet.While) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.While : TokenID.While
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3665,7 +3665,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Yield, Reservation.JavascriptFutureStrict, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "yield", ErrorRecoverySet.None) : void
 >                                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Yield : TokenID.Yield
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3715,7 +3715,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Identifier, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "identifier", ErrorRecoverySet.ID) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Identifier : TokenID.Identifier
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3765,7 +3765,7 @@ module TypeScript {
 >setTokenInfo(TokenID.NumberLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "numberLiteral", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.NumberLiteral : TokenID.NumberLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3815,7 +3815,7 @@ module TypeScript {
 >setTokenInfo(TokenID.RegularExpressionLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "regex", ErrorRecoverySet.RegExp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.RegularExpressionLiteral : TokenID.RegularExpressionLiteral
 >                                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3865,7 +3865,7 @@ module TypeScript {
 >setTokenInfo(TokenID.StringLiteral, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "qstring", ErrorRecoverySet.Literal) : void
 >                                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.StringLiteral : TokenID.StringLiteral
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3916,7 +3916,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Semicolon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ";", ErrorRecoverySet.SColon) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Semicolon : TokenID.Semicolon
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -3966,7 +3966,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ")", ErrorRecoverySet.RParen) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseParen : TokenID.CloseParen
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4016,7 +4016,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "]", ErrorRecoverySet.RBrack) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseBracket : TokenID.CloseBracket
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4066,7 +4066,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "{", ErrorRecoverySet.LCurly) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenBrace : TokenID.OpenBrace
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4116,7 +4116,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CloseBrace, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "}", ErrorRecoverySet.RCurly) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CloseBrace : TokenID.CloseBrace
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4166,7 +4166,7 @@ module TypeScript {
 >setTokenInfo(TokenID.DotDotDot, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "...", ErrorRecoverySet.None) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.DotDotDot : TokenID.DotDotDot
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4217,7 +4217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Comma, Reservation.None, OperatorPrecedence.Comma, NodeType.Comma, OperatorPrecedence.None, NodeType.None, ",", ErrorRecoverySet.Comma) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Comma : TokenID.Comma
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4267,7 +4267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Equals, Reservation.None, OperatorPrecedence.Assignment, NodeType.Asg, OperatorPrecedence.None, NodeType.None, "=", ErrorRecoverySet.Asg) : void
 >                                                                                                                                                               : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Equals : TokenID.Equals
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4317,7 +4317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAdd, OperatorPrecedence.None, NodeType.None, "+=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PlusEquals : TokenID.PlusEquals
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4367,7 +4367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgSub, OperatorPrecedence.None, NodeType.None, "-=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.MinusEquals : TokenID.MinusEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4417,7 +4417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AsteriskEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMul, OperatorPrecedence.None, NodeType.None, "*=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AsteriskEquals : TokenID.AsteriskEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4467,7 +4467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.SlashEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgDiv, OperatorPrecedence.None, NodeType.None, "/=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.SlashEquals : TokenID.SlashEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4517,7 +4517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PercentEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgMod, OperatorPrecedence.None, NodeType.None, "%=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PercentEquals : TokenID.PercentEquals
 >                      : ^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4567,7 +4567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgAnd, OperatorPrecedence.None, NodeType.None, "&=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AmpersandEquals : TokenID.AmpersandEquals
 >                        : ^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4617,7 +4617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.CaretEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgXor, OperatorPrecedence.None, NodeType.None, "^=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.CaretEquals : TokenID.CaretEquals
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4667,7 +4667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgOr, OperatorPrecedence.None, NodeType.None, "|=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.BarEquals : TokenID.BarEquals
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4717,7 +4717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgLsh, OperatorPrecedence.None, NodeType.None, "<<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanLessThanEquals : TokenID.LessThanLessThanEquals
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4767,7 +4767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRsh, OperatorPrecedence.None, NodeType.None, ">>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanEquals
 >                                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4817,7 +4817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThanEquals, Reservation.None, OperatorPrecedence.Assignment, NodeType.AsgRs2, OperatorPrecedence.None, NodeType.None, ">>>=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThanEquals : TokenID.GreaterThanGreaterThanGreaterThanEquals
 >                                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4867,7 +4867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Question, Reservation.None, OperatorPrecedence.Conditional, NodeType.ConditionalExpression, OperatorPrecedence.None, NodeType.None, "?", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Question : TokenID.Question
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4917,7 +4917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Colon, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, ":", ErrorRecoverySet.Colon) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Colon : TokenID.Colon
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -4967,7 +4967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.BarBar, Reservation.None, OperatorPrecedence.LogicalOr, NodeType.LogOr, OperatorPrecedence.None, NodeType.None, "||", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.BarBar : TokenID.BarBar
 >               : ^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5017,7 +5017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.AmpersandAmpersand, Reservation.None, OperatorPrecedence.LogicalAnd, NodeType.LogAnd, OperatorPrecedence.None, NodeType.None, "&&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.AmpersandAmpersand : TokenID.AmpersandAmpersand
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5067,7 +5067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Bar, Reservation.None, OperatorPrecedence.BitwiseOr, NodeType.Or, OperatorPrecedence.None, NodeType.None, "|", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Bar : TokenID.Bar
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5117,7 +5117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Caret, Reservation.None, OperatorPrecedence.BitwiseExclusiveOr, NodeType.Xor, OperatorPrecedence.None, NodeType.None, "^", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Caret : TokenID.Caret
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5167,7 +5167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.And, Reservation.None, OperatorPrecedence.BitwiseAnd, NodeType.And, OperatorPrecedence.None, NodeType.None, "&", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.And : TokenID.And
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5217,7 +5217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eq, OperatorPrecedence.None, NodeType.None, "==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsEquals : TokenID.EqualsEquals
 >                     : ^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5267,7 +5267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Ne, OperatorPrecedence.None, NodeType.None, "!=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                          : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.ExclamationEquals : TokenID.ExclamationEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5317,7 +5317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.Eqv, OperatorPrecedence.None, NodeType.None, "===", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsEqualsEquals : TokenID.EqualsEqualsEquals
 >                           : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5367,7 +5367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.ExclamationEqualsEquals, Reservation.None, OperatorPrecedence.Equality, NodeType.NEqv, OperatorPrecedence.None, NodeType.None, "!==", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                   : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.ExclamationEqualsEquals : TokenID.ExclamationEqualsEquals
 >                                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5417,7 +5417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Lt, OperatorPrecedence.None, NodeType.None, "<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThan : TokenID.LessThan
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5467,7 +5467,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Le, OperatorPrecedence.None, NodeType.None, "<=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanEquals : TokenID.LessThanEquals
 >                       : ^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5517,7 +5517,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThan, Reservation.None, OperatorPrecedence.Relational, NodeType.Gt, OperatorPrecedence.None, NodeType.None, ">", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                     : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThan : TokenID.GreaterThan
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5567,7 +5567,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanEquals, Reservation.None, OperatorPrecedence.Relational, NodeType.Ge, OperatorPrecedence.None, NodeType.None, ">=", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                            : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanEquals : TokenID.GreaterThanEquals
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5617,7 +5617,7 @@ module TypeScript {
 >setTokenInfo(TokenID.LessThanLessThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Lsh, OperatorPrecedence.None, NodeType.None, "<<", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.LessThanLessThan : TokenID.LessThanLessThan
 >                         : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5667,7 +5667,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rsh, OperatorPrecedence.None, NodeType.None, ">>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThan : TokenID.GreaterThanGreaterThan
 >                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5717,7 +5717,7 @@ module TypeScript {
 >setTokenInfo(TokenID.GreaterThanGreaterThanGreaterThan, Reservation.None, OperatorPrecedence.Shift, NodeType.Rs2, OperatorPrecedence.None, NodeType.None, ">>>", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                                         : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.GreaterThanGreaterThanGreaterThan : TokenID.GreaterThanGreaterThanGreaterThan
 >                                          : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5767,7 +5767,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Plus, Reservation.None, OperatorPrecedence.Additive, NodeType.Add, OperatorPrecedence.Unary, NodeType.Pos, "+", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                             : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Plus : TokenID.Plus
 >             : ^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5817,7 +5817,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Minus, Reservation.None, OperatorPrecedence.Additive, NodeType.Sub, OperatorPrecedence.Unary, NodeType.Neg, "-", ErrorRecoverySet.AddOp) : void
 >                                                                                                                                                              : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Minus : TokenID.Minus
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5867,7 +5867,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Asterisk, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mul, OperatorPrecedence.None, NodeType.None, "*", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Asterisk : TokenID.Asterisk
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5917,7 +5917,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Slash, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Div, OperatorPrecedence.None, NodeType.None, "/", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Slash : TokenID.Slash
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -5967,7 +5967,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Percent, Reservation.None, OperatorPrecedence.Multiplicative, NodeType.Mod, OperatorPrecedence.None, NodeType.None, "%", ErrorRecoverySet.BinOp) : void
 >                                                                                                                                                                      : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Percent : TokenID.Percent
 >                : ^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6017,7 +6017,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Tilde, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.Not, "~", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                           : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Tilde : TokenID.Tilde
 >              : ^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6067,7 +6067,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Exclamation, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.LogNot, "!", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Exclamation : TokenID.Exclamation
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6117,7 +6117,7 @@ module TypeScript {
 >setTokenInfo(TokenID.PlusPlus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.IncPre, "++", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.PlusPlus : TokenID.PlusPlus
 >                 : ^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6167,7 +6167,7 @@ module TypeScript {
 >setTokenInfo(TokenID.MinusMinus, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.Unary, NodeType.DecPre, "--", ErrorRecoverySet.PreOp) : void
 >                                                                                                                                                                    : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.MinusMinus : TokenID.MinusMinus
 >                   : ^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6217,7 +6217,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenParen, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "(", ErrorRecoverySet.LParen) : void
 >                                                                                                                                                                : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenParen : TokenID.OpenParen
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6267,7 +6267,7 @@ module TypeScript {
 >setTokenInfo(TokenID.OpenBracket, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "[", ErrorRecoverySet.LBrack) : void
 >                                                                                                                                                                  : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.OpenBracket : TokenID.OpenBracket
 >                    : ^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6317,7 +6317,7 @@ module TypeScript {
 >setTokenInfo(TokenID.Dot, Reservation.None, OperatorPrecedence.Unary, NodeType.None, OperatorPrecedence.None, NodeType.None, ".", ErrorRecoverySet.Dot) : void
 >                                                                                                                                                        : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.Dot : TokenID.Dot
 >            : ^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6367,7 +6367,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EndOfFile, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "<EOF>", ErrorRecoverySet.EOF) : void
 >                                                                                                                                                                 : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EndOfFile : TokenID.EndOfFile
 >                  : ^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
@@ -6417,7 +6417,7 @@ module TypeScript {
 >setTokenInfo(TokenID.EqualsGreaterThan, Reservation.None, OperatorPrecedence.None, NodeType.None, OperatorPrecedence.None, NodeType.None, "=>", ErrorRecoverySet.None) : void
 >                                                                                                                                                                       : ^^^^
 >setTokenInfo : (tokenId: TokenID, reservation: number, binopPrecedence: number, binopNodeType: number, unopPrecedence: number, unopNodeType: number, text: string, ers: ErrorRecoverySet) => void
->             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>             : ^       ^^       ^^           ^^      ^^               ^^      ^^             ^^      ^^              ^^      ^^            ^^      ^^    ^^      ^^   ^^                ^^^^^^^^^
 >TokenID.EqualsGreaterThan : TokenID.EqualsGreaterThan
 >                          : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >TokenID : typeof TokenID
diff --git a/tests/baselines/reference/parserRealSource11.types b/tests/baselines/reference/parserRealSource11.types
index 2eee22d1ed353..d941bb4c4efe1 100644
--- a/tests/baselines/reference/parserRealSource11.types
+++ b/tests/baselines/reference/parserRealSource11.types
@@ -136,7 +136,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -336,7 +336,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -777,7 +777,7 @@ module TypeScript {
 
         public print(context: PrintContext) {
 >print : (context: PrintContext) => void
->      : ^       ^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^       ^^            ^^^^^^^^^
 >context : PrintContext
 >        : ^^^^^^^^^^^^
 
@@ -1055,7 +1055,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1095,7 +1095,7 @@ module TypeScript {
 
         public netFreeUses(container: Symbol, freeUses: StringHashTable) {
 >netFreeUses : (container: Symbol, freeUses: StringHashTable) => void
->            : ^         ^^      ^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>            : ^         ^^      ^^        ^^               ^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 >freeUses : StringHashTable
@@ -1411,7 +1411,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -1666,7 +1666,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -1725,7 +1725,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -1797,7 +1797,7 @@ module TypeScript {
 >this.members[i].typeCheck(typeFlow) : any
 >                                    : ^^^
 >this.members[i].typeCheck : (typeFlow: TypeFlow) => any
->                          : ^        ^^^^^^^^^^^^^^^^^^
+>                          : ^        ^^        ^^^^^^^^
 >this.members[i] : AST
 >                : ^^^
 >this.members : AST[]
@@ -1809,7 +1809,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
                 }
@@ -2018,7 +2018,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2037,7 +2037,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2062,7 +2062,7 @@ module TypeScript {
 
         public static fromToken(token: Token): Identifier {
 >fromToken : (token: Token) => Identifier
->          : ^     ^^^^^^^^^^^^          
+>          : ^     ^^     ^^^^^          
 >token : Token
 >      : ^^^^^
 
@@ -2119,7 +2119,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2174,7 +2174,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2201,7 +2201,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -2390,7 +2390,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2398,11 +2398,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Expression
 >      : ^^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -2437,7 +2437,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -2992,7 +2992,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -3835,7 +3835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -3884,7 +3884,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -4035,7 +4035,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -4777,7 +4777,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5447,7 +5447,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5466,7 +5466,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5657,7 +5657,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5703,7 +5703,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -5946,7 +5946,7 @@ module TypeScript {
         
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -5973,7 +5973,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6082,7 +6082,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6161,7 +6161,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6286,7 +6286,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -6571,7 +6571,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6864,7 +6864,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -6988,7 +6988,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7111,7 +7111,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -7728,7 +7728,7 @@ module TypeScript {
 
         public buildControlFlow(): ControlFlowContext {
 >buildControlFlow : () => ControlFlowContext
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^^^^^^                  
 
             var entry = new BasicBlock();
 >entry : any
@@ -7760,9 +7760,9 @@ module TypeScript {
 
             var controlFlowPrefix = (ast: AST, parent: AST, walker: IAstWalker) => {
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >(ast: AST, parent: AST, walker: IAstWalker) => {                ast.addToControlFlow(walker.state);                return ast;            } : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7774,11 +7774,11 @@ module TypeScript {
 >ast.addToControlFlow(walker.state) : void
 >                                   : ^^^^
 >ast.addToControlFlow : (context: ControlFlowContext) => void
->                     : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                     : ^       ^^                  ^^^^^    
 >ast : AST
 >    : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >walker.state : any
 >             : ^^^
 >walker : IAstWalker
@@ -7805,7 +7805,7 @@ module TypeScript {
 >getWalker : any
 >          : ^^^
 >controlFlowPrefix : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                  : ^   ^^   ^^      ^^   ^^      ^^^^^^^^^^^^^^^^^^^^
+>                  : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >context : any
 >        : ^^^
 
@@ -7846,7 +7846,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -7865,7 +7865,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -8540,7 +8540,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -8873,7 +8873,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9231,7 +9231,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9250,7 +9250,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9506,7 +9506,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9525,7 +9525,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9592,7 +9592,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9611,7 +9611,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9682,7 +9682,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9735,7 +9735,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9815,7 +9815,7 @@ module TypeScript {
 >this.labels.members[i].emit(emitter, tokenId, startLine) : void
 >                                                         : ^^^^
 >this.labels.members[i].emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->                            : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>                            : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >this.labels.members[i] : AST
 >                       : ^^^
 >this.labels.members : AST[]
@@ -9831,7 +9831,7 @@ module TypeScript {
 >i : number
 >  : ^^^^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9844,7 +9844,7 @@ module TypeScript {
 >this.stmt.emit(emitter, tokenId, true) : void
 >                                       : ^^^^
 >this.stmt.emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->               : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>               : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9852,7 +9852,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -9889,7 +9889,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9921,7 +9921,7 @@ module TypeScript {
 >this.stmt.typeCheck(typeFlow) : any
 >                              : ^^^
 >this.stmt.typeCheck : (typeFlow: TypeFlow) => any
->                    : ^        ^^^^^^^^^^^^^^^^^^
+>                    : ^        ^^        ^^^^^^^^
 >this.stmt : AST
 >          : ^^^
 >this : this
@@ -9929,7 +9929,7 @@ module TypeScript {
 >stmt : AST
 >     : ^^^
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -9940,7 +9940,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10017,7 +10017,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10245,7 +10245,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10381,7 +10381,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -10524,7 +10524,7 @@ module TypeScript {
 
         public setResolvedTarget(parser: Parser, stmt: Statement): boolean {
 >setResolvedTarget : (parser: Parser, stmt: Statement) => boolean
->                  : ^      ^^^^^^^^^^    ^^         ^^^^^       
+>                  : ^      ^^      ^^    ^^         ^^^^^       
 >parser : Parser
 >       : ^^^^^^
 >stmt : Statement
@@ -10655,7 +10655,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10663,11 +10663,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -10706,7 +10706,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -10886,7 +10886,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11043,7 +11043,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11062,7 +11062,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11365,7 +11365,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -11578,7 +11578,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -11597,7 +11597,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -11872,7 +11872,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12101,7 +12101,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -12120,7 +12120,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12128,7 +12128,7 @@ module TypeScript {
 >this.cond.addToControlFlow(context) : void
 >                                    : ^^^^
 >this.cond.addToControlFlow : (context: ControlFlowContext) => void
->                           : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                           : ^       ^^                  ^^^^^    
 >this.cond : AST
 >          : ^^^
 >this : this
@@ -12136,7 +12136,7 @@ module TypeScript {
 >cond : AST
 >     : ^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12530,7 +12530,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -12676,7 +12676,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12684,11 +12684,11 @@ module TypeScript {
 >super.addToControlFlow(context) : void
 >                                : ^^^^
 >super.addToControlFlow : (context: ControlFlowContext) => void
->                       : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                       : ^       ^^                  ^^^^^    
 >super : Statement
 >      : ^^^^^^^^^
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -12705,7 +12705,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13357,7 +13357,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -13582,7 +13582,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -13652,7 +13652,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -13942,7 +13942,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14257,7 +14257,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14276,7 +14276,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext): void {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^       ^^                  ^^^^^    
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -14779,7 +14779,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -14919,7 +14919,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => any
->          : ^        ^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -14984,7 +14984,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15299,7 +15299,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15451,7 +15451,7 @@ module TypeScript {
         // if there are break statements that match this switch, then just link cond block with block after switch
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -15730,7 +15730,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -15882,7 +15882,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -15951,7 +15951,7 @@ module TypeScript {
         // for now, assume all cases are reachable, regardless of whether some cases fall through
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16170,7 +16170,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16189,7 +16189,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16397,7 +16397,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16480,7 +16480,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -16557,7 +16557,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -16803,7 +16803,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -16914,7 +16914,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17163,7 +17163,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17266,7 +17266,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17365,7 +17365,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -17400,7 +17400,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17531,7 +17531,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -17710,7 +17710,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -17835,7 +17835,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18288,7 +18288,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
@@ -18387,7 +18387,7 @@ module TypeScript {
 
         public addToControlFlow(context: ControlFlowContext) {
 >addToControlFlow : (context: ControlFlowContext) => void
->                 : ^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                 : ^       ^^                  ^^^^^^^^^
 >context : ControlFlowContext
 >        : ^^^^^^^^^^^^^^^^^^
 
@@ -18452,7 +18452,7 @@ module TypeScript {
 
         public typeCheck(typeFlow: TypeFlow) {
 >typeCheck : (typeFlow: TypeFlow) => this
->          : ^        ^^^^^^^^^^^^^^^^^^^
+>          : ^        ^^        ^^^^^^^^^
 >typeFlow : TypeFlow
 >         : ^^^^^^^^
 
@@ -18687,7 +18687,7 @@ module TypeScript {
 
         public emit(emitter: Emitter, tokenId: TokenID, startLine: boolean) {
 >emit : (emitter: Emitter, tokenId: TokenID, startLine: boolean) => void
->     : ^       ^^^^^^^^^^^       ^^^^^^^^^^^         ^^       ^^^^^^^^^
+>     : ^       ^^       ^^       ^^       ^^         ^^       ^^^^^^^^^
 >emitter : Emitter
 >        : ^^^^^^^
 >tokenId : TokenID
diff --git a/tests/baselines/reference/parserRealSource12.types b/tests/baselines/reference/parserRealSource12.types
index 28627d5cc3cf2..6763d907264ef 100644
--- a/tests/baselines/reference/parserRealSource12.types
+++ b/tests/baselines/reference/parserRealSource12.types
@@ -13,7 +13,7 @@ module TypeScript {
     export interface IAstWalker {
         walk(ast: AST, parent: AST): AST;
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -136,7 +136,7 @@ module TypeScript {
 
         public walk(ast: AST, parent: AST): AST {
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -355,7 +355,7 @@ module TypeScript {
 
         public walk(ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any): AST {
 >walk : (ast: AST, pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => AST
->     : ^   ^^^^^^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^^^^
+>     : ^   ^^   ^^   ^^                ^^    ^^^                ^^       ^^^              ^^     ^^^   ^^^^^   
 >ast : AST
 >    : ^^^
 >pre : IAstWalkCallback
@@ -371,7 +371,7 @@ module TypeScript {
 >this.getWalker(pre, post, options, state).walk(ast, null) : AST
 >                                                          : ^^^
 >this.getWalker(pre, post, options, state).walk : (ast: AST, parent: AST) => AST
->                                               : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                               : ^   ^^   ^^      ^^   ^^^^^   
 >this.getWalker(pre, post, options, state) : IAstWalker
 >                                          : ^^^^^^^^^^
 >this.getWalker : (pre: IAstWalkCallback, post?: IAstWalkCallback, options?: AstWalkOptions, state?: any) => IAstWalker
@@ -389,7 +389,7 @@ module TypeScript {
 >state : any
 >      : ^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >ast : AST
 >    : ^^^
         }
@@ -481,7 +481,7 @@ module TypeScript {
 
             this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.None] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.None] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -497,15 +497,15 @@ module TypeScript {
 >None : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Empty] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Empty] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -521,15 +521,15 @@ module TypeScript {
 >Empty : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EmptyExpr] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EmptyExpr] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -545,15 +545,15 @@ module TypeScript {
 >EmptyExpr : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.True] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.True] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -569,15 +569,15 @@ module TypeScript {
 >True : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.False] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.False] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -593,15 +593,15 @@ module TypeScript {
 >False : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.This] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.This] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -617,15 +617,15 @@ module TypeScript {
 >This : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Super] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Super] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -641,15 +641,15 @@ module TypeScript {
 >Super : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.QString] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.QString] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -665,15 +665,15 @@ module TypeScript {
 >QString : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Regex] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Regex] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -689,15 +689,15 @@ module TypeScript {
 >Regex : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Null] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Null] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -713,15 +713,15 @@ module TypeScript {
 >Null : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ArrayLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArrayLit] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -737,15 +737,15 @@ module TypeScript {
 >ArrayLit : any
 >         : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.ObjectLit] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                       : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                       : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ObjectLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -761,15 +761,15 @@ module TypeScript {
 >ObjectLit : any
 >          : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Void] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Void] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -785,15 +785,15 @@ module TypeScript {
 >Void : any
 >     : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Comma] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comma] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -809,15 +809,15 @@ module TypeScript {
 >Comma : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Pos] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Pos] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -833,15 +833,15 @@ module TypeScript {
 >Pos : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Neg] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Neg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -857,15 +857,15 @@ module TypeScript {
 >Neg : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Delete] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Delete] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -881,15 +881,15 @@ module TypeScript {
 >Delete : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Await] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Await] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -905,15 +905,15 @@ module TypeScript {
 >Await : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.In] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.In] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -929,15 +929,15 @@ module TypeScript {
 >In : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Dot] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Dot] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -953,15 +953,15 @@ module TypeScript {
 >Dot : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.From] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.From] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -977,15 +977,15 @@ module TypeScript {
 >From : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Is] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Is] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1001,15 +1001,15 @@ module TypeScript {
 >Is : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.InstOf] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InstOf] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1025,15 +1025,15 @@ module TypeScript {
 >InstOf : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Typeof] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Typeof] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1049,15 +1049,15 @@ module TypeScript {
 >Typeof : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.NumberLit] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NumberLit] : IAstWalkChildren
 >                                         : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1073,15 +1073,15 @@ module TypeScript {
 >NumberLit : any
 >          : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Name] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                               : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                               : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Name] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1097,15 +1097,15 @@ module TypeScript {
 >Name : any
 >     : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren;
 >this.childrenWalkers[NodeType.TypeRef] = ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeRef] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1121,15 +1121,15 @@ module TypeScript {
 >TypeRef : any
 >        : ^^^
 >ChildrenWalkers.walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Index] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Index] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1145,15 +1145,15 @@ module TypeScript {
 >Index : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.Call] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Call] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1169,15 +1169,15 @@ module TypeScript {
 >Call : any
 >     : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren;
 >this.childrenWalkers[NodeType.New] = ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.New] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1193,15 +1193,15 @@ module TypeScript {
 >New : any
 >    : ^^^
 >ChildrenWalkers.walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Asg] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Asg] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1217,15 +1217,15 @@ module TypeScript {
 >Asg : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAdd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAdd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1241,15 +1241,15 @@ module TypeScript {
 >AsgAdd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgSub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgSub] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1265,15 +1265,15 @@ module TypeScript {
 >AsgSub : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgDiv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgDiv] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1289,15 +1289,15 @@ module TypeScript {
 >AsgDiv : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMul] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1313,15 +1313,15 @@ module TypeScript {
 >AsgMul : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgMod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgMod] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1337,15 +1337,15 @@ module TypeScript {
 >AsgMod : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1361,15 +1361,15 @@ module TypeScript {
 >AsgAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgXor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgXor] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1385,15 +1385,15 @@ module TypeScript {
 >AsgXor : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1409,15 +1409,15 @@ module TypeScript {
 >AsgOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgLsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgLsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1433,15 +1433,15 @@ module TypeScript {
 >AsgLsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRsh] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1457,15 +1457,15 @@ module TypeScript {
 >AsgRsh : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.AsgRs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.AsgRs2] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1481,15 +1481,15 @@ module TypeScript {
 >AsgRs2 : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren;
 >this.childrenWalkers[NodeType.ConditionalExpression] = ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                                     : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ConditionalExpression] : IAstWalkChildren
 >                                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1505,15 +1505,15 @@ module TypeScript {
 >ConditionalExpression : any
 >                      : ^^^
 >ChildrenWalkers.walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogOr] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogOr] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1529,15 +1529,15 @@ module TypeScript {
 >LogOr : any
 >      : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogAnd] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogAnd] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1553,15 +1553,15 @@ module TypeScript {
 >LogAnd : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Or] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Or] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1577,15 +1577,15 @@ module TypeScript {
 >Or : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Xor] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Xor] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1601,15 +1601,15 @@ module TypeScript {
 >Xor : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.And] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.And] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1625,15 +1625,15 @@ module TypeScript {
 >And : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eq] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eq] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1649,15 +1649,15 @@ module TypeScript {
 >Eq : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ne] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ne] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1673,15 +1673,15 @@ module TypeScript {
 >Ne : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Eqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Eqv] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1697,15 +1697,15 @@ module TypeScript {
 >Eqv : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.NEqv] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.NEqv] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1721,15 +1721,15 @@ module TypeScript {
 >NEqv : any
 >     : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1745,15 +1745,15 @@ module TypeScript {
 >Lt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Le] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Le] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1769,15 +1769,15 @@ module TypeScript {
 >Le : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Gt] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Gt] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1793,15 +1793,15 @@ module TypeScript {
 >Gt : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Ge] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Ge] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1817,15 +1817,15 @@ module TypeScript {
 >Ge : any
 >   : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Add] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Add] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1841,15 +1841,15 @@ module TypeScript {
 >Add : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Sub] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Sub] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1865,15 +1865,15 @@ module TypeScript {
 >Sub : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mul] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mul] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1889,15 +1889,15 @@ module TypeScript {
 >Mul : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Div] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Div] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1913,15 +1913,15 @@ module TypeScript {
 >Div : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Mod] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Mod] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1937,15 +1937,15 @@ module TypeScript {
 >Mod : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Lsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Lsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1961,15 +1961,15 @@ module TypeScript {
 >Lsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rsh] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rsh] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -1985,15 +1985,15 @@ module TypeScript {
 >Rsh : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Rs2] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Rs2] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2009,15 +2009,15 @@ module TypeScript {
 >Rs2 : any
 >    : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Not] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                 : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                 : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Not] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2033,15 +2033,15 @@ module TypeScript {
 >Not : any
 >    : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.LogNot] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LogNot] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2057,15 +2057,15 @@ module TypeScript {
 >LogNot : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2081,15 +2081,15 @@ module TypeScript {
 >IncPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPre] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPre] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2105,15 +2105,15 @@ module TypeScript {
 >DecPre : any
 >       : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.IncPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.IncPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2129,15 +2129,15 @@ module TypeScript {
 >IncPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.DecPost] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DecPost] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2153,15 +2153,15 @@ module TypeScript {
 >DecPost : any
 >        : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.TypeAssertion] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TypeAssertion] : IAstWalkChildren
 >                                             : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2177,15 +2177,15 @@ module TypeScript {
 >TypeAssertion : any
 >              : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren;
 >this.childrenWalkers[NodeType.FuncDecl] = ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.FuncDecl] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2201,15 +2201,15 @@ module TypeScript {
 >FuncDecl : any
 >         : ^^^
 >ChildrenWalkers.walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren;
 >this.childrenWalkers[NodeType.Member] = ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                     : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                     : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Member] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2225,15 +2225,15 @@ module TypeScript {
 >Member : any
 >       : ^^^
 >ChildrenWalkers.walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.VarDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.VarDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2249,15 +2249,15 @@ module TypeScript {
 >VarDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren;
 >this.childrenWalkers[NodeType.ArgDecl] = ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ArgDecl] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2273,15 +2273,15 @@ module TypeScript {
 >ArgDecl : any
 >        : ^^^
 >ChildrenWalkers.walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren;
 >this.childrenWalkers[NodeType.Return] = ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Return] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2297,15 +2297,15 @@ module TypeScript {
 >Return : any
 >       : ^^^
 >ChildrenWalkers.walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Break] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Break] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2321,15 +2321,15 @@ module TypeScript {
 >Break : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Continue] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Continue] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2345,15 +2345,15 @@ module TypeScript {
 >Continue : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren;
 >this.childrenWalkers[NodeType.Throw] = ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Throw] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2369,15 +2369,15 @@ module TypeScript {
 >Throw : any
 >      : ^^^
 >ChildrenWalkers.walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren;
 >this.childrenWalkers[NodeType.For] = ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                                                              : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                              : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.For] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2393,15 +2393,15 @@ module TypeScript {
 >For : any
 >    : ^^^
 >ChildrenWalkers.walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren;
 >this.childrenWalkers[NodeType.ForIn] = ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ForIn] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2417,15 +2417,15 @@ module TypeScript {
 >ForIn : any
 >      : ^^^
 >ChildrenWalkers.walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren;
 >this.childrenWalkers[NodeType.If] = ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                                                            : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                            : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.If] : IAstWalkChildren
 >                                  : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2441,15 +2441,15 @@ module TypeScript {
 >If : any
 >   : ^^^
 >ChildrenWalkers.walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren;
 >this.childrenWalkers[NodeType.While] = ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                  : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                  : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.While] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2465,15 +2465,15 @@ module TypeScript {
 >While : any
 >      : ^^^
 >ChildrenWalkers.walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren;
 >this.childrenWalkers[NodeType.DoWhile] = ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                                                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.DoWhile] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2489,15 +2489,15 @@ module TypeScript {
 >DoWhile : any
 >        : ^^^
 >ChildrenWalkers.walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren;
 >this.childrenWalkers[NodeType.Block] = ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Block] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2513,15 +2513,15 @@ module TypeScript {
 >Block : any
 >      : ^^^
 >ChildrenWalkers.walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren;
 >this.childrenWalkers[NodeType.Case] = ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Case] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2537,15 +2537,15 @@ module TypeScript {
 >Case : any
 >     : ^^^
 >ChildrenWalkers.walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren;
 >this.childrenWalkers[NodeType.Switch] = ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                                                                    : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                    : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Switch] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2561,15 +2561,15 @@ module TypeScript {
 >Switch : any
 >       : ^^^
 >ChildrenWalkers.walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren;
 >this.childrenWalkers[NodeType.Try] = ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                                                     : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                     : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Try] : IAstWalkChildren
 >                                   : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2585,15 +2585,15 @@ module TypeScript {
 >Try : any
 >    : ^^^
 >ChildrenWalkers.walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren;
 >this.childrenWalkers[NodeType.TryCatch] = ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                                                               : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                               : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryCatch] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2609,15 +2609,15 @@ module TypeScript {
 >TryCatch : any
 >         : ^^^
 >ChildrenWalkers.walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren;
 >this.childrenWalkers[NodeType.TryFinally] = ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                                                                   : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                   : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.TryFinally] : IAstWalkChildren
 >                                          : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2633,15 +2633,15 @@ module TypeScript {
 >TryFinally : any
 >           : ^^^
 >ChildrenWalkers.walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren;
 >this.childrenWalkers[NodeType.Finally] = ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                                                             : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                             : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Finally] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2657,15 +2657,15 @@ module TypeScript {
 >Finally : any
 >        : ^^^
 >ChildrenWalkers.walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren;
 >this.childrenWalkers[NodeType.Catch] = ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Catch] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2681,15 +2681,15 @@ module TypeScript {
 >Catch : any
 >      : ^^^
 >ChildrenWalkers.walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren;
 >this.childrenWalkers[NodeType.List] = ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                       : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                       : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.List] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2705,15 +2705,15 @@ module TypeScript {
 >List : any
 >     : ^^^
 >ChildrenWalkers.walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren;
 >this.childrenWalkers[NodeType.Script] = ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                                                           : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                           : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Script] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2729,15 +2729,15 @@ module TypeScript {
 >Script : any
 >       : ^^^
 >ChildrenWalkers.walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren;
 >this.childrenWalkers[NodeType.ClassDeclaration] = ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                        : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                        : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ClassDeclaration] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2753,15 +2753,15 @@ module TypeScript {
 >ClassDeclaration : any
 >                 : ^^^
 >ChildrenWalkers.walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren;
 >this.childrenWalkers[NodeType.InterfaceDeclaration] = ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                           : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                           : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.InterfaceDeclaration] : IAstWalkChildren
 >                                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2777,15 +2777,15 @@ module TypeScript {
 >InterfaceDeclaration : any
 >                     : ^^^
 >ChildrenWalkers.walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren;
 >this.childrenWalkers[NodeType.ModuleDeclaration] = ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ModuleDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2801,15 +2801,15 @@ module TypeScript {
 >ModuleDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren;
 >this.childrenWalkers[NodeType.ImportDeclaration] = ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                                                                          : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                          : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.ImportDeclaration] : IAstWalkChildren
 >                                                 : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2825,15 +2825,15 @@ module TypeScript {
 >ImportDeclaration : any
 >                  : ^^^
 >ChildrenWalkers.walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren;
 >this.childrenWalkers[NodeType.With] = ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                                                                : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.With] : IAstWalkChildren
 >                                    : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2849,15 +2849,15 @@ module TypeScript {
 >With : any
 >     : ^^^
 >ChildrenWalkers.walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren;
 >this.childrenWalkers[NodeType.Label] = ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                                                         : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                         : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Label] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2873,15 +2873,15 @@ module TypeScript {
 >Label : any
 >      : ^^^
 >ChildrenWalkers.walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren;
 >this.childrenWalkers[NodeType.LabeledStatement] = ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                                                                               : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                                               : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.LabeledStatement] : IAstWalkChildren
 >                                                : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2897,15 +2897,15 @@ module TypeScript {
 >LabeledStatement : any
 >                 : ^^^
 >ChildrenWalkers.walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EBStart] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EBStart] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2921,15 +2921,15 @@ module TypeScript {
 >EBStart : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.GotoEB] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.GotoEB] : IAstWalkChildren
 >                                      : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2945,15 +2945,15 @@ module TypeScript {
 >GotoEB : any
 >       : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.EndCode] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.EndCode] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2969,15 +2969,15 @@ module TypeScript {
 >EndCode : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Error] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Error] : IAstWalkChildren
 >                                     : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -2993,15 +2993,15 @@ module TypeScript {
 >Error : any
 >      : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Comment] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                  : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                  : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Comment] : IAstWalkChildren
 >                                       : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3017,15 +3017,15 @@ module TypeScript {
 >Comment : any
 >        : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone;
 >this.childrenWalkers[NodeType.Debugger] = ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                                                                   : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                                                                   : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >this.childrenWalkers[NodeType.Debugger] : IAstWalkChildren
 >                                        : ^^^^^^^^^^^^^^^^
 >this.childrenWalkers : IAstWalkChildren[]
@@ -3041,11 +3041,11 @@ module TypeScript {
 >Debugger : any
 >         : ^^^
 >ChildrenWalkers.walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >ChildrenWalkers : typeof ChildrenWalkers
 >                : ^^^^^^^^^^^^^^^^^^^^^^
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 
             // Verify the code is up to date with the enum
             for (var e in (<any>NodeType)._map) {
@@ -3129,7 +3129,7 @@ module TypeScript {
 
         export function walkNone(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkNone : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->         : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>         : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3142,7 +3142,7 @@ module TypeScript {
 
         export function walkListChildren(preAst: ASTList, parent: AST, walker: IAstWalker): void {
 >walkListChildren : (preAst: ASTList, parent: AST, walker: IAstWalker) => void
->                 : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                 : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ASTList
 >       : ^^^^^^^
 >parent : AST
@@ -3224,11 +3224,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3289,11 +3289,11 @@ module TypeScript {
 >walker.walk(preAst.members[i], preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members[i] : any
 >                  : ^^^
 >preAst.members : any
@@ -3313,7 +3313,7 @@ module TypeScript {
 
         export function walkUnaryExpressionChildren(preAst: UnaryExpression, parent: AST, walker: IAstWalker): void {
 >walkUnaryExpressionChildren : (preAst: UnaryExpression, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : UnaryExpression
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -3341,11 +3341,11 @@ module TypeScript {
 >walker.walk(preAst.castTerm, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.castTerm : any
 >                : ^^^
 >preAst : UnaryExpression
@@ -3375,11 +3375,11 @@ module TypeScript {
 >walker.walk(preAst.operand, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand : any
 >               : ^^^
 >preAst : UnaryExpression
@@ -3393,7 +3393,7 @@ module TypeScript {
 
         export function walkBinaryExpressionChildren(preAst: BinaryExpression, parent: AST, walker: IAstWalker): void {
 >walkBinaryExpressionChildren : (preAst: BinaryExpression, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : BinaryExpression
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3433,11 +3433,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3483,11 +3483,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3518,11 +3518,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3568,11 +3568,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : BinaryExpression
@@ -3587,7 +3587,7 @@ module TypeScript {
 
         export function walkTypeReferenceChildren(preAst: TypeReference, parent: AST, walker: IAstWalker): void {
 >walkTypeReferenceChildren : (preAst: TypeReference, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeReference
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -3615,11 +3615,11 @@ module TypeScript {
 >walker.walk(preAst.term, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.term : any
 >            : ^^^
 >preAst : TypeReference
@@ -3633,7 +3633,7 @@ module TypeScript {
 
         export function walkCallExpressionChildren(preAst: CallExpression, parent: AST, walker: IAstWalker): void {
 >walkCallExpressionChildren : (preAst: CallExpression, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : CallExpression
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -3667,11 +3667,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3717,11 +3717,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.arguments : any
 >                 : ^^^
 >preAst : CallExpression
@@ -3771,11 +3771,11 @@ module TypeScript {
 >walker.walk(preAst.target, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.target : any
 >              : ^^^
 >preAst : CallExpression
@@ -3789,7 +3789,7 @@ module TypeScript {
 
         export function walkTrinaryExpressionChildren(preAst: ConditionalExpression, parent: AST, walker: IAstWalker): void {
 >walkTrinaryExpressionChildren : (preAst: ConditionalExpression, parent: AST, walker: IAstWalker) => void
->                              : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                              : ^      ^^                     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ConditionalExpression
 >       : ^^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -3817,11 +3817,11 @@ module TypeScript {
 >walker.walk(preAst.operand1, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand1 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3865,11 +3865,11 @@ module TypeScript {
 >walker.walk(preAst.operand2, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand2 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3913,11 +3913,11 @@ module TypeScript {
 >walker.walk(preAst.operand3, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.operand3 : any
 >                : ^^^
 >preAst : ConditionalExpression
@@ -3931,7 +3931,7 @@ module TypeScript {
 
         export function walkFuncDeclChildren(preAst: FuncDecl, parent: AST, walker: IAstWalker): void {
 >walkFuncDeclChildren : (preAst: FuncDecl, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : FuncDecl
 >       : ^^^^^^^^
 >parent : AST
@@ -3961,11 +3961,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.name : any
 >            : ^^^
 >preAst : FuncDecl
@@ -4033,11 +4033,11 @@ module TypeScript {
 >walker.walk(preAst.arguments, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.arguments : any
 >                 : ^^^
 >preAst : FuncDecl
@@ -4081,11 +4081,11 @@ module TypeScript {
 >walker.walk(preAst.returnTypeAnnotation, preAst) : AST
 >                                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.returnTypeAnnotation : any
 >                            : ^^^
 >preAst : FuncDecl
@@ -4153,11 +4153,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.bod : any
 >           : ^^^
 >preAst : FuncDecl
@@ -4171,7 +4171,7 @@ module TypeScript {
 
         export function walkBoundDeclChildren(preAst: BoundDecl, parent: AST, walker: IAstWalker): void {
 >walkBoundDeclChildren : (preAst: BoundDecl, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^         ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : BoundDecl
 >       : ^^^^^^^^^
 >parent : AST
@@ -4201,11 +4201,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.id : any
 >          : ^^^
 >preAst : BoundDecl
@@ -4235,11 +4235,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.init : any
 >            : ^^^
 >preAst : BoundDecl
@@ -4285,11 +4285,11 @@ module TypeScript {
 >walker.walk(preAst.typeExpr, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.typeExpr : any
 >                : ^^^
 >preAst : BoundDecl
@@ -4303,7 +4303,7 @@ module TypeScript {
 
         export function walkReturnStatementChildren(preAst: ReturnStatement, parent: AST, walker: IAstWalker): void {
 >walkReturnStatementChildren : (preAst: ReturnStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ReturnStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -4331,11 +4331,11 @@ module TypeScript {
 >walker.walk(preAst.returnExpression, preAst) : AST
 >                                             : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.returnExpression : any
 >                        : ^^^
 >preAst : ReturnStatement
@@ -4349,7 +4349,7 @@ module TypeScript {
 
         export function walkForStatementChildren(preAst: ForStatement, parent: AST, walker: IAstWalker): void {
 >walkForStatementChildren : (preAst: ForStatement, parent: AST, walker: IAstWalker) => void
->                         : ^      ^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                         : ^      ^^            ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ForStatement
 >       : ^^^^^^^^^^^^
 >parent : AST
@@ -4377,11 +4377,11 @@ module TypeScript {
 >walker.walk(preAst.init, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.init : any
 >            : ^^^
 >preAst : ForStatement
@@ -4424,11 +4424,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : ForStatement
@@ -4471,11 +4471,11 @@ module TypeScript {
 >walker.walk(preAst.incr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.incr : any
 >            : ^^^
 >preAst : ForStatement
@@ -4518,11 +4518,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : ForStatement
@@ -4536,7 +4536,7 @@ module TypeScript {
 
         export function walkForInStatementChildren(preAst: ForInStatement, parent: AST, walker: IAstWalker): void {
 >walkForInStatementChildren : (preAst: ForInStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ForInStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4556,11 +4556,11 @@ module TypeScript {
 >walker.walk(preAst.lval, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.lval : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4594,11 +4594,11 @@ module TypeScript {
 >walker.walk(preAst.obj, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.obj : any
 >           : ^^^
 >preAst : ForInStatement
@@ -4642,11 +4642,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : ForInStatement
@@ -4660,7 +4660,7 @@ module TypeScript {
 
         export function walkIfStatementChildren(preAst: IfStatement, parent: AST, walker: IAstWalker): void {
 >walkIfStatementChildren : (preAst: IfStatement, parent: AST, walker: IAstWalker) => void
->                        : ^      ^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                        : ^      ^^           ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : IfStatement
 >       : ^^^^^^^^^^^
 >parent : AST
@@ -4680,11 +4680,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : IfStatement
@@ -4728,11 +4728,11 @@ module TypeScript {
 >walker.walk(preAst.thenBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.thenBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4776,11 +4776,11 @@ module TypeScript {
 >walker.walk(preAst.elseBod, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.elseBod : any
 >               : ^^^
 >preAst : IfStatement
@@ -4794,7 +4794,7 @@ module TypeScript {
 
         export function walkWhileStatementChildren(preAst: WhileStatement, parent: AST, walker: IAstWalker): void {
 >walkWhileStatementChildren : (preAst: WhileStatement, parent: AST, walker: IAstWalker) => void
->                           : ^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                           : ^      ^^              ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : WhileStatement
 >       : ^^^^^^^^^^^^^^
 >parent : AST
@@ -4814,11 +4814,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4862,11 +4862,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : WhileStatement
@@ -4880,7 +4880,7 @@ module TypeScript {
 
         export function walkDoWhileStatementChildren(preAst: DoWhileStatement, parent: AST, walker: IAstWalker): void {
 >walkDoWhileStatementChildren : (preAst: DoWhileStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : DoWhileStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -4900,11 +4900,11 @@ module TypeScript {
 >walker.walk(preAst.cond, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.cond : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4948,11 +4948,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : DoWhileStatement
@@ -4966,7 +4966,7 @@ module TypeScript {
 
         export function walkBlockChildren(preAst: Block, parent: AST, walker: IAstWalker): void {
 >walkBlockChildren : (preAst: Block, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Block
 >       : ^^^^^
 >parent : AST
@@ -4996,11 +4996,11 @@ module TypeScript {
 >walker.walk(preAst.statements, preAst) : AST
 >                                       : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.statements : any
 >                  : ^^^
 >preAst : Block
@@ -5014,7 +5014,7 @@ module TypeScript {
 
         export function walkCaseStatementChildren(preAst: CaseStatement, parent: AST, walker: IAstWalker): void {
 >walkCaseStatementChildren : (preAst: CaseStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : CaseStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -5042,11 +5042,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.expr : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5091,11 +5091,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : CaseStatement
@@ -5109,7 +5109,7 @@ module TypeScript {
 
         export function walkSwitchStatementChildren(preAst: SwitchStatement, parent: AST, walker: IAstWalker): void {
 >walkSwitchStatementChildren : (preAst: SwitchStatement, parent: AST, walker: IAstWalker) => void
->                            : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                            : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : SwitchStatement
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5137,11 +5137,11 @@ module TypeScript {
 >walker.walk(preAst.val, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.val : any
 >           : ^^^
 >preAst : SwitchStatement
@@ -5188,11 +5188,11 @@ module TypeScript {
 >walker.walk(preAst.caseList, preAst) : AST
 >                                     : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.caseList : any
 >                : ^^^
 >preAst : SwitchStatement
@@ -5206,7 +5206,7 @@ module TypeScript {
 
         export function walkTryChildren(preAst: Try, parent: AST, walker: IAstWalker): void {
 >walkTryChildren : (preAst: Try, parent: AST, walker: IAstWalker) => void
->                : ^      ^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                : ^      ^^   ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Try
 >       : ^^^
 >parent : AST
@@ -5234,11 +5234,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Try
@@ -5252,7 +5252,7 @@ module TypeScript {
 
         export function walkTryCatchChildren(preAst: TryCatch, parent: AST, walker: IAstWalker): void {
 >walkTryCatchChildren : (preAst: TryCatch, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^        ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TryCatch
 >       : ^^^^^^^^
 >parent : AST
@@ -5282,11 +5282,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryCatch
@@ -5333,11 +5333,11 @@ module TypeScript {
 >walker.walk(preAst.catchNode, preAst) : AST
 >                                      : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.catchNode : any
 >                 : ^^^
 >preAst : TryCatch
@@ -5351,7 +5351,7 @@ module TypeScript {
 
         export function walkTryFinallyChildren(preAst: TryFinally, parent: AST, walker: IAstWalker): void {
 >walkTryFinallyChildren : (preAst: TryFinally, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^          ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TryFinally
 >       : ^^^^^^^^^^
 >parent : AST
@@ -5379,11 +5379,11 @@ module TypeScript {
 >walker.walk(preAst.tryNode, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.tryNode : any
 >               : ^^^
 >preAst : TryFinally
@@ -5428,11 +5428,11 @@ module TypeScript {
 >walker.walk(preAst.finallyNode, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.finallyNode : any
 >                   : ^^^
 >preAst : TryFinally
@@ -5446,7 +5446,7 @@ module TypeScript {
 
         export function walkFinallyChildren(preAst: Finally, parent: AST, walker: IAstWalker): void {
 >walkFinallyChildren : (preAst: Finally, parent: AST, walker: IAstWalker) => void
->                    : ^      ^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                    : ^      ^^       ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Finally
 >       : ^^^^^^^
 >parent : AST
@@ -5474,11 +5474,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Finally
@@ -5492,7 +5492,7 @@ module TypeScript {
 
         export function walkCatchChildren(preAst: Catch, parent: AST, walker: IAstWalker): void {
 >walkCatchChildren : (preAst: Catch, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Catch
 >       : ^^^^^
 >parent : AST
@@ -5522,11 +5522,11 @@ module TypeScript {
 >walker.walk(preAst.param, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.param : any
 >             : ^^^
 >preAst : Catch
@@ -5571,11 +5571,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : Catch
@@ -5589,7 +5589,7 @@ module TypeScript {
 
         export function walkRecordChildren(preAst: NamedDeclaration, parent: AST, walker: IAstWalker): void {
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : NamedDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5611,11 +5611,11 @@ module TypeScript {
 >walker.walk(preAst.name, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.name : any
 >            : ^^^
 >preAst : NamedDeclaration
@@ -5659,11 +5659,11 @@ module TypeScript {
 >walker.walk(preAst.members, preAst) : AST
 >                                    : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.members : any
 >               : ^^^
 >preAst : NamedDeclaration
@@ -5678,7 +5678,7 @@ module TypeScript {
 
         export function walkNamedTypeChildren(preAst: TypeDeclaration, parent: AST, walker: IAstWalker): void {
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5690,7 +5690,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : TypeDeclaration
 >       : ^^^^^^^^^^^^^^^
 >parent : AST
@@ -5701,7 +5701,7 @@ module TypeScript {
 
         export function walkClassDeclChildren(preAst: ClassDeclaration, parent: AST, walker: IAstWalker): void {
 >walkClassDeclChildren : (preAst: ClassDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5713,7 +5713,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ClassDeclaration
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5755,11 +5755,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : ClassDeclaration
@@ -5804,11 +5804,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : ClassDeclaration
@@ -5822,7 +5822,7 @@ module TypeScript {
 
         export function walkScriptChildren(preAst: Script, parent: AST, walker: IAstWalker): void {
 >walkScriptChildren : (preAst: Script, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^      ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Script
 >       : ^^^^^^
 >parent : AST
@@ -5852,11 +5852,11 @@ module TypeScript {
 >walker.walk(preAst.bod, preAst) : AST
 >                                : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.bod : any
 >           : ^^^
 >preAst : Script
@@ -5870,7 +5870,7 @@ module TypeScript {
 
         export function walkTypeDeclChildren(preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker): void {
 >walkTypeDeclChildren : (preAst: InterfaceDeclaration, parent: AST, walker: IAstWalker) => void
->                     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                     : ^      ^^                    ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5882,7 +5882,7 @@ module TypeScript {
 >walkNamedTypeChildren(preAst, parent, walker) : void
 >                                              : ^^^^
 >walkNamedTypeChildren : (preAst: TypeDeclaration, parent: AST, walker: IAstWalker) => void
->                      : ^      ^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                      : ^      ^^               ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : InterfaceDeclaration
 >       : ^^^^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -5925,11 +5925,11 @@ module TypeScript {
 >walker.walk(preAst.extendsList, preAst) : AST
 >                                        : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.extendsList : any
 >                   : ^^^
 >preAst : InterfaceDeclaration
@@ -5974,11 +5974,11 @@ module TypeScript {
 >walker.walk(preAst.implementsList, preAst) : AST
 >                                           : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.implementsList : any
 >                      : ^^^
 >preAst : InterfaceDeclaration
@@ -5992,7 +5992,7 @@ module TypeScript {
 
         export function walkModuleDeclChildren(preAst: ModuleDeclaration, parent: AST, walker: IAstWalker): void {
 >walkModuleDeclChildren : (preAst: ModuleDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6004,7 +6004,7 @@ module TypeScript {
 >walkRecordChildren(preAst, parent, walker) : void
 >                                           : ^^^^
 >walkRecordChildren : (preAst: NamedDeclaration, parent: AST, walker: IAstWalker) => void
->                   : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                   : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ModuleDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6015,7 +6015,7 @@ module TypeScript {
 
         export function walkImportDeclChildren(preAst: ImportDeclaration, parent: AST, walker: IAstWalker): void {
 >walkImportDeclChildren : (preAst: ImportDeclaration, parent: AST, walker: IAstWalker) => void
->                       : ^      ^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                       : ^      ^^                 ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : ImportDeclaration
 >       : ^^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6045,11 +6045,11 @@ module TypeScript {
 >walker.walk(preAst.id, preAst) : AST
 >                               : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.id : any
 >          : ^^^
 >preAst : ImportDeclaration
@@ -6079,11 +6079,11 @@ module TypeScript {
 >walker.walk(preAst.alias, preAst) : AST
 >                                  : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.alias : any
 >             : ^^^
 >preAst : ImportDeclaration
@@ -6097,7 +6097,7 @@ module TypeScript {
 
         export function walkWithStatementChildren(preAst: WithStatement, parent: AST, walker: IAstWalker): void {
 >walkWithStatementChildren : (preAst: WithStatement, parent: AST, walker: IAstWalker) => void
->                          : ^      ^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                          : ^      ^^             ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : WithStatement
 >       : ^^^^^^^^^^^^^
 >parent : AST
@@ -6125,11 +6125,11 @@ module TypeScript {
 >walker.walk(preAst.expr, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.expr : any
 >            : ^^^
 >preAst : WithStatement
@@ -6172,11 +6172,11 @@ module TypeScript {
 >walker.walk(preAst.body, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.body : any
 >            : ^^^
 >preAst : WithStatement
@@ -6190,7 +6190,7 @@ module TypeScript {
 
         export function walkLabelChildren(preAst: Label, parent: AST, walker: IAstWalker): void {
 >walkLabelChildren : (preAst: Label, parent: AST, walker: IAstWalker) => void
->                  : ^      ^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                  : ^      ^^     ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : Label
 >       : ^^^^^
 >parent : AST
@@ -6203,7 +6203,7 @@ module TypeScript {
 
         export function walkLabeledStatementChildren(preAst: LabeledStatement, parent: AST, walker: IAstWalker): void {
 >walkLabeledStatementChildren : (preAst: LabeledStatement, parent: AST, walker: IAstWalker) => void
->                             : ^      ^^^^^^^^^^^^^^^^^^^^      ^^^^^^^      ^^          ^^^^^    
+>                             : ^      ^^                ^^      ^^   ^^      ^^          ^^^^^    
 >preAst : LabeledStatement
 >       : ^^^^^^^^^^^^^^^^
 >parent : AST
@@ -6225,11 +6225,11 @@ module TypeScript {
 >walker.walk(preAst.labels, preAst) : AST
 >                                   : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.labels : any
 >              : ^^^
 >preAst : LabeledStatement
@@ -6263,11 +6263,11 @@ module TypeScript {
 >walker.walk(preAst.stmt, preAst) : AST
 >                                 : ^^^
 >walker.walk : (ast: AST, parent: AST) => AST
->            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^^^^   
 >walker : IAstWalker
 >       : ^^^^^^^^^^
 >walk : (ast: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^   
 >preAst.stmt : any
 >            : ^^^
 >preAst : LabeledStatement
diff --git a/tests/baselines/reference/parserRealSource13.types b/tests/baselines/reference/parserRealSource13.types
index a67ca5abfadf0..90f4660a711ff 100644
--- a/tests/baselines/reference/parserRealSource13.types
+++ b/tests/baselines/reference/parserRealSource13.types
@@ -15,7 +15,7 @@ module TypeScript.AstWalkerWithDetailCallback {
     export interface AstWalkerDetailCallback {
         EmptyCallback? (pre, ast: AST): boolean;
 >EmptyCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -23,7 +23,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EmptyExprCallback? (pre, ast: AST): boolean;
 >EmptyExprCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -31,7 +31,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TrueCallback? (pre, ast: AST): boolean;
 >TrueCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -39,7 +39,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FalseCallback? (pre, ast: AST): boolean;
 >FalseCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -47,7 +47,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThisCallback? (pre, ast: AST): boolean;
 >ThisCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -55,7 +55,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SuperCallback? (pre, ast: AST): boolean;
 >SuperCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -63,7 +63,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QStringCallback? (pre, ast: AST): boolean;
 >QStringCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -71,7 +71,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RegexCallback? (pre, ast: AST): boolean;
 >RegexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -79,7 +79,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NullCallback? (pre, ast: AST): boolean;
 >NullCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -87,7 +87,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArrayLitCallback? (pre, ast: AST): boolean;
 >ArrayLitCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -95,7 +95,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ObjectLitCallback? (pre, ast: AST): boolean;
 >ObjectLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -103,7 +103,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VoidCallback? (pre, ast: AST): boolean;
 >VoidCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -111,7 +111,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommaCallback? (pre, ast: AST): boolean;
 >CommaCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -119,7 +119,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         PosCallback? (pre, ast: AST): boolean;
 >PosCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -127,7 +127,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NegCallback? (pre, ast: AST): boolean;
 >NegCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -135,7 +135,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DeleteCallback? (pre, ast: AST): boolean;
 >DeleteCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -143,7 +143,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AwaitCallback? (pre, ast: AST): boolean;
 >AwaitCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -151,7 +151,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InCallback? (pre, ast: AST): boolean;
 >InCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -159,7 +159,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DotCallback? (pre, ast: AST): boolean;
 >DotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -167,7 +167,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FromCallback? (pre, ast: AST): boolean;
 >FromCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -175,7 +175,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IsCallback? (pre, ast: AST): boolean;
 >IsCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -183,7 +183,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InstOfCallback? (pre, ast: AST): boolean;
 >InstOfCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -191,7 +191,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeofCallback? (pre, ast: AST): boolean;
 >TypeofCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -199,7 +199,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NumberLitCallback? (pre, ast: AST): boolean;
 >NumberLitCallback : (pre: any, ast: AST) => boolean
->                  : ^   ^^^^^^^   ^^^^^^^^^^       
+>                  : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -207,7 +207,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NameCallback? (pre, identifierAst: Identifier): boolean;
 >NameCallback : (pre: any, identifierAst: Identifier) => boolean
->             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^       
+>             : ^   ^^^^^^^             ^^          ^^^^^       
 >pre : any
 >    : ^^^
 >identifierAst : Identifier
@@ -215,7 +215,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeRefCallback? (pre, ast: AST): boolean;
 >TypeRefCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -223,7 +223,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IndexCallback? (pre, ast: AST): boolean;
 >IndexCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -231,7 +231,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CallCallback? (pre, ast: AST): boolean;
 >CallCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -239,7 +239,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NewCallback? (pre, ast: AST): boolean;
 >NewCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -247,7 +247,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgCallback? (pre, ast: AST): boolean;
 >AsgCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -255,7 +255,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAddCallback? (pre, ast: AST): boolean;
 >AsgAddCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -263,7 +263,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgSubCallback? (pre, ast: AST): boolean;
 >AsgSubCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -271,7 +271,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgDivCallback? (pre, ast: AST): boolean;
 >AsgDivCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -279,7 +279,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgMulCallback? (pre, ast: AST): boolean;
 >AsgMulCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -287,7 +287,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgModCallback? (pre, ast: AST): boolean;
 >AsgModCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -295,7 +295,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgAndCallback? (pre, ast: AST): boolean;
 >AsgAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -303,7 +303,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgXorCallback? (pre, ast: AST): boolean;
 >AsgXorCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -311,7 +311,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgOrCallback? (pre, ast: AST): boolean;
 >AsgOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -319,7 +319,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgLshCallback? (pre, ast: AST): boolean;
 >AsgLshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -327,7 +327,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRshCallback? (pre, ast: AST): boolean;
 >AsgRshCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -335,7 +335,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AsgRs2Callback? (pre, ast: AST): boolean;
 >AsgRs2Callback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -343,7 +343,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         QMarkCallback? (pre, ast: AST): boolean;
 >QMarkCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -351,7 +351,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogOrCallback? (pre, ast: AST): boolean;
 >LogOrCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -359,7 +359,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogAndCallback? (pre, ast: AST): boolean;
 >LogAndCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -367,7 +367,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         OrCallback? (pre, ast: AST): boolean;
 >OrCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -375,7 +375,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         XorCallback? (pre, ast: AST): boolean;
 >XorCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -383,7 +383,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AndCallback? (pre, ast: AST): boolean;
 >AndCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -391,7 +391,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqCallback? (pre, ast: AST): boolean;
 >EqCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -399,7 +399,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NeCallback? (pre, ast: AST): boolean;
 >NeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -407,7 +407,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EqvCallback? (pre, ast: AST): boolean;
 >EqvCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -415,7 +415,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NEqvCallback? (pre, ast: AST): boolean;
 >NEqvCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -423,7 +423,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LtCallback? (pre, ast: AST): boolean;
 >LtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -431,7 +431,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LeCallback? (pre, ast: AST): boolean;
 >LeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -439,7 +439,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GtCallback? (pre, ast: AST): boolean;
 >GtCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -447,7 +447,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GeCallback? (pre, ast: AST): boolean;
 >GeCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -455,7 +455,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         AddCallback? (pre, ast: AST): boolean;
 >AddCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -463,7 +463,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SubCallback? (pre, ast: AST): boolean;
 >SubCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -471,7 +471,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MulCallback? (pre, ast: AST): boolean;
 >MulCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -479,7 +479,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DivCallback? (pre, ast: AST): boolean;
 >DivCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -487,7 +487,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModCallback? (pre, ast: AST): boolean;
 >ModCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -495,7 +495,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LshCallback? (pre, ast: AST): boolean;
 >LshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -503,7 +503,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         RshCallback? (pre, ast: AST): boolean;
 >RshCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -511,7 +511,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         Rs2Callback? (pre, ast: AST): boolean;
 >Rs2Callback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -519,7 +519,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         NotCallback? (pre, ast: AST): boolean;
 >NotCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -527,7 +527,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LogNotCallback? (pre, ast: AST): boolean;
 >LogNotCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -535,7 +535,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPreCallback? (pre, ast: AST): boolean;
 >IncPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -543,7 +543,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPreCallback? (pre, ast: AST): boolean;
 >DecPreCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -551,7 +551,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IncPostCallback? (pre, ast: AST): boolean;
 >IncPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -559,7 +559,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DecPostCallback? (pre, ast: AST): boolean;
 >DecPostCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -567,7 +567,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TypeAssertionCallback? (pre, ast: AST): boolean;
 >TypeAssertionCallback : (pre: any, ast: AST) => boolean
->                      : ^   ^^^^^^^   ^^^^^^^^^^       
+>                      : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -575,7 +575,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FuncDeclCallback? (pre, funcDecl: FuncDecl): boolean;
 >FuncDeclCallback : (pre: any, funcDecl: FuncDecl) => boolean
->                 : ^   ^^^^^^^        ^^^^^^^^^^^^^^^       
+>                 : ^   ^^^^^^^        ^^        ^^^^^       
 >pre : any
 >    : ^^^
 >funcDecl : FuncDecl
@@ -583,7 +583,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         MemberCallback? (pre, ast: AST): boolean;
 >MemberCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -591,7 +591,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         VarDeclCallback? (pre, varDecl: VarDecl): boolean;
 >VarDeclCallback : (pre: any, varDecl: VarDecl) => boolean
->                : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
+>                : ^   ^^^^^^^       ^^       ^^^^^       
 >pre : any
 >    : ^^^
 >varDecl : VarDecl
@@ -599,7 +599,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ArgDeclCallback? (pre, ast: AST): boolean;
 >ArgDeclCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -607,7 +607,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ReturnCallback? (pre, ast: AST): boolean;
 >ReturnCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -615,7 +615,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BreakCallback? (pre, ast: AST): boolean;
 >BreakCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -623,7 +623,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ContinueCallback? (pre, ast: AST): boolean;
 >ContinueCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -631,7 +631,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ThrowCallback? (pre, ast: AST): boolean;
 >ThrowCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -639,7 +639,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForCallback? (pre, ast: AST): boolean;
 >ForCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -647,7 +647,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ForInCallback? (pre, ast: AST): boolean;
 >ForInCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -655,7 +655,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         IfCallback? (pre, ast: AST): boolean;
 >IfCallback : (pre: any, ast: AST) => boolean
->           : ^   ^^^^^^^   ^^^^^^^^^^       
+>           : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -663,7 +663,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WhileCallback? (pre, ast: AST): boolean;
 >WhileCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -671,7 +671,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DoWhileCallback? (pre, ast: AST): boolean;
 >DoWhileCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -679,7 +679,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         BlockCallback? (pre, block: Block): boolean;
 >BlockCallback : (pre: any, block: Block) => boolean
->              : ^   ^^^^^^^     ^^^^^^^^^^^^       
+>              : ^   ^^^^^^^     ^^     ^^^^^       
 >pre : any
 >    : ^^^
 >block : Block
@@ -687,7 +687,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CaseCallback? (pre, ast: AST): boolean;
 >CaseCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -695,7 +695,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         SwitchCallback? (pre, ast: AST): boolean;
 >SwitchCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -703,7 +703,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCallback? (pre, ast: AST): boolean;
 >TryCallback : (pre: any, ast: AST) => boolean
->            : ^   ^^^^^^^   ^^^^^^^^^^       
+>            : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -711,7 +711,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryCatchCallback? (pre, ast: AST): boolean;
 >TryCatchCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -719,7 +719,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         TryFinallyCallback? (pre, ast: AST): boolean;
 >TryFinallyCallback : (pre: any, ast: AST) => boolean
->                   : ^   ^^^^^^^   ^^^^^^^^^^       
+>                   : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -727,7 +727,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         FinallyCallback? (pre, ast: AST): boolean;
 >FinallyCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -735,7 +735,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CatchCallback? (pre, ast: AST): boolean;
 >CatchCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -743,7 +743,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ListCallback? (pre, astList: ASTList): boolean;
 >ListCallback : (pre: any, astList: ASTList) => boolean
->             : ^   ^^^^^^^       ^^^^^^^^^^^^^^       
+>             : ^   ^^^^^^^       ^^       ^^^^^       
 >pre : any
 >    : ^^^
 >astList : ASTList
@@ -751,7 +751,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ScriptCallback? (pre, script: Script): boolean;
 >ScriptCallback : (pre: any, script: Script) => boolean
->               : ^   ^^^^^^^      ^^^^^^^^^^^^^       
+>               : ^   ^^^^^^^      ^^      ^^^^^       
 >pre : any
 >    : ^^^
 >script : Script
@@ -759,7 +759,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ClassDeclarationCallback? (pre, ast: AST): boolean;
 >ClassDeclarationCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -767,7 +767,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         InterfaceDeclarationCallback? (pre, interfaceDecl: InterfaceDeclaration): boolean;
 >InterfaceDeclarationCallback : (pre: any, interfaceDecl: InterfaceDeclaration) => boolean
->                             : ^   ^^^^^^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^       
+>                             : ^   ^^^^^^^             ^^                    ^^^^^       
 >pre : any
 >    : ^^^
 >interfaceDecl : InterfaceDeclaration
@@ -775,7 +775,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ModuleDeclarationCallback? (pre, moduleDecl: ModuleDeclaration): boolean;
 >ModuleDeclarationCallback : (pre: any, moduleDecl: ModuleDeclaration) => boolean
->                          : ^   ^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^       
+>                          : ^   ^^^^^^^          ^^                 ^^^^^       
 >pre : any
 >    : ^^^
 >moduleDecl : ModuleDeclaration
@@ -783,7 +783,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ImportDeclarationCallback? (pre, ast: AST): boolean;
 >ImportDeclarationCallback : (pre: any, ast: AST) => boolean
->                          : ^   ^^^^^^^   ^^^^^^^^^^       
+>                          : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -791,7 +791,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         WithCallback? (pre, ast: AST): boolean;
 >WithCallback : (pre: any, ast: AST) => boolean
->             : ^   ^^^^^^^   ^^^^^^^^^^       
+>             : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -799,7 +799,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabelCallback? (pre, labelAST: AST): boolean;
 >LabelCallback : (pre: any, labelAST: AST) => boolean
->              : ^   ^^^^^^^        ^^^^^^^^^^       
+>              : ^   ^^^^^^^        ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >labelAST : AST
@@ -807,7 +807,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         LabeledStatementCallback? (pre, ast: AST): boolean;
 >LabeledStatementCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -815,7 +815,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EBStartCallback? (pre, ast: AST): boolean;
 >EBStartCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -823,7 +823,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         GotoEBCallback? (pre, ast: AST): boolean;
 >GotoEBCallback : (pre: any, ast: AST) => boolean
->               : ^   ^^^^^^^   ^^^^^^^^^^       
+>               : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -831,7 +831,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         EndCodeCallback? (pre, ast: AST): boolean;
 >EndCodeCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -839,7 +839,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         ErrorCallback? (pre, ast: AST): boolean;
 >ErrorCallback : (pre: any, ast: AST) => boolean
->              : ^   ^^^^^^^   ^^^^^^^^^^       
+>              : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -847,7 +847,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         CommentCallback? (pre, ast: AST): boolean;
 >CommentCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -855,7 +855,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DebuggerCallback? (pre, ast: AST): boolean;
 >DebuggerCallback : (pre: any, ast: AST) => boolean
->                 : ^   ^^^^^^^   ^^^^^^^^^^       
+>                 : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -863,7 +863,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         DefaultCallback? (pre, ast: AST): boolean;
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : any
 >    : ^^^
 >ast : AST
@@ -872,7 +872,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     export function walk(script: Script, callback: AstWalkerDetailCallback): void {
 >walk : (script: Script, callback: AstWalkerDetailCallback) => void
->     : ^      ^^^^^^^^^^        ^^                       ^^^^^    
+>     : ^      ^^      ^^        ^^                       ^^^^^    
 >script : Script
 >       : ^^^^^^
 >callback : AstWalkerDetailCallback
@@ -880,9 +880,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var pre = (cur: AST, parent: AST) => {
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>    : ^   ^^   ^^      ^^   ^^^^^^^^
 >(cur: AST, parent: AST) => {            walker.options.goChildren = AstWalkerCallback(true, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                                            : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                                                                                                                            : ^   ^^   ^^      ^^   ^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -904,7 +904,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(true, cur, callback) : boolean
 >                                       : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >true : true
 >     : ^^^^
 >cur : AST
@@ -919,9 +919,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         var post = (cur: AST, parent: AST) => {
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^^^^
 >(cur: AST, parent: AST) => {            AstWalkerCallback(false, cur, callback);            return cur;        } : (cur: AST, parent: AST) => AST
->                                                                                                                 : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>                                                                                                                 : ^   ^^   ^^      ^^   ^^^^^^^^
 >cur : AST
 >    : ^^^
 >parent : AST
@@ -931,7 +931,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 >AstWalkerCallback(false, cur, callback) : boolean
 >                                        : ^^^^^^^
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >false : false
 >      : ^^^^^
 >cur : AST
@@ -962,9 +962,9 @@ module TypeScript.AstWalkerWithDetailCallback {
 >getWalker : any
 >          : ^^^
 >pre : (cur: AST, parent: AST) => AST
->    : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>    : ^   ^^   ^^      ^^   ^^^^^^^^
 >post : (cur: AST, parent: AST) => AST
->     : ^   ^^^^^^^      ^^^^^^^^^^^^^
+>     : ^   ^^   ^^      ^^   ^^^^^^^^
 
         walker.walk(script, null);
 >walker.walk(script, null) : any
@@ -981,7 +981,7 @@ module TypeScript.AstWalkerWithDetailCallback {
 
     function AstWalkerCallback(pre: boolean, ast: AST, callback: AstWalkerDetailCallback): boolean {
 >AstWalkerCallback : (pre: boolean, ast: AST, callback: AstWalkerDetailCallback) => boolean
->                  : ^   ^^       ^^   ^^^^^^^        ^^                       ^^^^^       
+>                  : ^   ^^       ^^   ^^   ^^        ^^                       ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
@@ -1047,21 +1047,21 @@ module TypeScript.AstWalkerWithDetailCallback {
 
         if (callback.DefaultCallback) {
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 
             return callback.DefaultCallback(pre, ast);
 >callback.DefaultCallback(pre, ast) : boolean
 >                                   : ^^^^^^^
 >callback.DefaultCallback : (pre: any, ast: AST) => boolean
->                         : ^   ^^^^^^^   ^^^^^^^^^^       
+>                         : ^   ^^^^^^^   ^^   ^^^^^       
 >callback : AstWalkerDetailCallback
 >         : ^^^^^^^^^^^^^^^^^^^^^^^
 >DefaultCallback : (pre: any, ast: AST) => boolean
->                : ^   ^^^^^^^   ^^^^^^^^^^       
+>                : ^   ^^^^^^^   ^^   ^^^^^       
 >pre : boolean
 >    : ^^^^^^^
 >ast : AST
diff --git a/tests/baselines/reference/parserRealSource14.types b/tests/baselines/reference/parserRealSource14.types
index 15987b2cc71ff..6619d911f4142 100644
--- a/tests/baselines/reference/parserRealSource14.types
+++ b/tests/baselines/reference/parserRealSource14.types
@@ -235,7 +235,7 @@ module TypeScript {
 
         public pop(): TypeScript.AST {
 >pop : () => TypeScript.AST
->    : ^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^              
 >TypeScript : any
 >           : ^^^
 
@@ -304,7 +304,7 @@ module TypeScript {
 
         public push(ast: TypeScript.AST) {
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -469,7 +469,7 @@ module TypeScript {
 
         public nodeType(): TypeScript.NodeType {
 >nodeType : () => TypeScript.NodeType
->         : ^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^^^^^^                   
 >TypeScript : any
 >           : ^^^
 
@@ -623,7 +623,7 @@ module TypeScript {
 
         public get(index: number): TypeScript.AST {
 >get : (index: number) => TypeScript.AST
->    : ^     ^^      ^^^^^^^^^^^^^^^^^^^
+>    : ^     ^^      ^^^^^              
 >index : number
 >      : ^^^^^^
 >TypeScript : any
@@ -6838,7 +6838,7 @@ module TypeScript {
 
     export function isValidAstNode(ast: TypeScript.ASTSpan): boolean {
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >ast : TypeScript.ASTSpan
 >    : ^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6947,7 +6947,7 @@ module TypeScript {
     ///
     export function getAstPathToPosition(script: TypeScript.AST, pos: number, options = GetAstPathOptions.Default): TypeScript.AstPath {
 >getAstPathToPosition : (script: TypeScript.AST, pos: number, options?: GetAstPathOptions) => TypeScript.AstPath
->                     : ^      ^^^^^^^^^^^^^^^^^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
+>                     : ^      ^^              ^^   ^^      ^^       ^^^^^^^^^^^^^^^^^^^^^^^^^                  
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7079,7 +7079,7 @@ module TypeScript {
 >ctx.path.push(comments[i]) : void
 >                           : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>              : ^   ^^              ^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7087,7 +7087,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >comments[i] : TypeScript.Comment
 >            : ^^^^^^^^^^^^^^^^^^
 >comments : TypeScript.Comment[]
@@ -7101,9 +7101,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) {            if (isValidAstNode(cur)) {                // Add "cur" to the stack if it contains our position                // For "identifier" nodes, we need a special case: A position equal to "limChar" is                // valid, since the position corresponds to a caret position (in between characters)                // For example:                //  bar                //  0123                // If "position == 3", the caret is at the "right" of the "r" character, which should be considered valid                var inclusive =                    hasFlag(options, GetAstPathOptions.EdgeInclusive) ||                    cur.nodeType === TypeScript.NodeType.Name ||                    pos === script.limChar; // Special "EOF" case                var minChar = cur.minChar;                var limChar = cur.limChar + (inclusive ? 1 : 0)                if (pos >= minChar && pos < limChar) {                    // TODO: Since AST is sometimes not correct wrt to position, only add "cur" if it's better                    //       than top of the stack.                    var previous = ctx.path.ast();                    if (previous == null || (cur.minChar >= previous.minChar && cur.limChar <= previous.limChar)) {                        ctx.path.push(cur);                    }                    else {                        //logger.log("TODO: Ignoring node because minChar, limChar not better than previous node in stack");                    }                }                // The AST walker skips comments, but we might be in one, so check the pre/post comments for this node manually                if (pos < limChar) {                    lookInComments(cur.preComments);                }                if (pos >= minChar) {                    lookInComments(cur.postComments);                }                if (!hasFlag(options, GetAstPathOptions.DontPruneSearchBasedOnPosition)) {                    // Don't go further down the tree if pos is outside of [minChar, limChar]                    walker.options.goChildren = (minChar <= pos && pos <= limChar);                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7119,7 +7119,7 @@ module TypeScript {
 >isValidAstNode(cur) : boolean
 >                    : ^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7294,7 +7294,7 @@ module TypeScript {
 >ctx.path.push(cur) : void
 >                   : ^^^^
 >ctx.path.push : (ast: TypeScript.AST) => void
->              : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>              : ^   ^^              ^^^^^^^^^
 >ctx.path : AstPath
 >         : ^^^^^^^
 >ctx : AstPathContext
@@ -7302,7 +7302,7 @@ module TypeScript {
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
                     }
@@ -7432,7 +7432,7 @@ module TypeScript {
 >script : TypeScript.AST
 >       : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^          ^^^^^^^^^^^^^^^^^^^
 >ctx : AstPathContext
 >    : ^^^^^^^^^^^^^^
 
@@ -7451,7 +7451,7 @@ module TypeScript {
     //
     export function getTokenizationOffset(script: TypeScript.Script, position: number): number {
 >getTokenizationOffset : (script: TypeScript.Script, position: number) => number
->                      : ^      ^^^^^^^^^^^^^^^^^^^^^        ^^      ^^^^^      
+>                      : ^      ^^                 ^^        ^^      ^^^^^      
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7467,9 +7467,9 @@ module TypeScript {
 
         var pre = (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 >(cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker): TypeScript.AST => {            if (TypeScript.isValidAstNode(cur)) {                // Did we find a closer offset?                if (cur.minChar <= position) {                    bestOffset = max(bestOffset, cur.minChar);                }                // Stop the walk if this node is not related to "minChar"                if (cur.minChar > position || cur.limChar < bestOffset) {                    walker.options.goChildren = false;                }            }            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7489,11 +7489,11 @@ module TypeScript {
 >TypeScript.isValidAstNode(cur) : boolean
 >                               : ^^^^^^^
 >TypeScript.isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->                          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>                          : ^   ^^                  ^^^^^       
 >TypeScript : typeof TypeScript
 >           : ^^^^^^^^^^^^^^^^^
 >isValidAstNode : (ast: TypeScript.ASTSpan) => boolean
->               : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^       
+>               : ^   ^^                  ^^^^^       
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7595,7 +7595,7 @@ module TypeScript {
 >script : TypeScript.Script
 >       : ^^^^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^              
 
         return bestOffset;
 >bestOffset : number
@@ -7607,13 +7607,13 @@ module TypeScript {
     ///
     export function walkAST(ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void ): void {
 >walkAST : (ast: TypeScript.AST, callback: (path: AstPath, walker: TypeScript.IAstWalker) => void) => void
->        : ^   ^^^^^^^^^^^^^^^^^^        ^^                                                      ^^^^^    
+>        : ^   ^^              ^^        ^^                                                      ^^^^^    
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
 >           : ^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>         : ^    ^^       ^^      ^^                     ^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7623,9 +7623,9 @@ module TypeScript {
 
         var pre = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.push(cur);            callback(path, walker);            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                                                              : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                                                              : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7655,11 +7655,11 @@ module TypeScript {
 >path.push(cur) : void
 >               : ^^^^
 >path.push : (ast: TypeScript.AST) => void
->          : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>          : ^   ^^              ^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
 >push : (ast: TypeScript.AST) => void
->     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 
@@ -7667,7 +7667,7 @@ module TypeScript {
 >callback(path, walker) : void
 >                       : ^^^^
 >callback : (path: AstPath, walker: TypeScript.IAstWalker) => void
->         : ^    ^^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>         : ^    ^^       ^^      ^^                     ^^^^^    
 >path : AstPath
 >     : ^^^^^^^
 >walker : TypeScript.IAstWalker
@@ -7679,9 +7679,9 @@ module TypeScript {
         }
         var post = function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >function (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) {            var path: TypeScript.AstPath = walker.state;            path.pop();            return cur;        } : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->                                                                                                                                                                                                       : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                                       : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >cur : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -7711,11 +7711,11 @@ module TypeScript {
 >path.pop() : TypeScript.AST
 >           : ^^^^^^^^^^^^^^
 >path.pop : () => TypeScript.AST
->         : ^^^^^^^^^^^^^^^^^^^^
+>         : ^^^^^^              
 >path : AstPath
 >     : ^^^^^^^
 >pop : () => TypeScript.AST
->    : ^^^^^^^^^^^^^^^^^^^^
+>    : ^^^^^^              
 
             return cur;
 >cur : TypeScript.AST
@@ -7748,9 +7748,9 @@ module TypeScript {
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >pre : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->    : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>    : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >post : (cur: TypeScript.AST, parent: TypeScript.AST, walker: TypeScript.IAstWalker) => TypeScript.AST
->     : ^   ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^   ^^              ^^      ^^              ^^      ^^                     ^^^^^^^^^^^^^^^^^^^
 >path : AstPath
 >     : ^^^^^^^
     }
diff --git a/tests/baselines/reference/parserRealSource5.types b/tests/baselines/reference/parserRealSource5.types
index 5705a96538950..8f3ed1a4a4b1f 100644
--- a/tests/baselines/reference/parserRealSource5.types
+++ b/tests/baselines/reference/parserRealSource5.types
@@ -285,7 +285,7 @@ module TypeScript {
 
     export function prePrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >prePrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->            : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>            : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -335,7 +335,7 @@ module TypeScript {
 
     export function postPrintAST(ast: AST, parent: AST, walker: IAstWalker) {
 >postPrintAST : (ast: AST, parent: AST, walker: IAstWalker) => AST
->             : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>             : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource6.types b/tests/baselines/reference/parserRealSource6.types
index 19d355f02ffdc..0ca3b7cf60791 100644
--- a/tests/baselines/reference/parserRealSource6.types
+++ b/tests/baselines/reference/parserRealSource6.types
@@ -66,11 +66,11 @@ module TypeScript {
 
         public scopeGetter: () => SymbolScope = null;
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 
         public objectLiteralScopeGetter: () => SymbolScope = null;
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
 
         public scopeStartAST: AST = null;
 >scopeStartAST : AST
@@ -133,32 +133,32 @@ module TypeScript {
 
         public getScope(): SymbolScope {
 >getScope : () => SymbolScope
->         : ^^^^^^^^^^^^^^^^^
+>         : ^^^^^^           
 
             return this.scopeGetter();
 >this.scopeGetter() : SymbolScope
 >                   : ^^^^^^^^^^^
 >this.scopeGetter : () => SymbolScope
->                 : ^^^^^^^^^^^^^^^^^
+>                 : ^^^^^^           
 >this : this
 >     : ^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
         }
 
         public getObjectLiteralScope(): SymbolScope {
 >getObjectLiteralScope : () => SymbolScope
->                      : ^^^^^^^^^^^^^^^^^
+>                      : ^^^^^^           
 
             return this.objectLiteralScopeGetter();
 >this.objectLiteralScopeGetter() : SymbolScope
 >                                : ^^^^^^^^^^^
 >this.objectLiteralScopeGetter : () => SymbolScope
->                              : ^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^           
 >this : this
 >     : ^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
         }
 
         public getScopeAST() {
@@ -193,7 +193,7 @@ module TypeScript {
 
         public getScriptFragmentStartAST(): AST {
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 
             return this.scopeStartAST;
 >this.scopeStartAST : AST
@@ -214,18 +214,18 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^^^^
+>                               : ^^^^^^   
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 >minChar : any
 >        : ^^^
         }
 
         public getScriptFragment(): Script {
 >getScriptFragment : () => Script
->                  : ^^^^^^^^^^^^
+>                  : ^^^^^^      
 
             if (this.scriptFragment == null) {
 >this.scriptFragment == null : boolean
@@ -243,11 +243,11 @@ module TypeScript {
 >this.getScriptFragmentStartAST() : AST
 >                                 : ^^^
 >this.getScriptFragmentStartAST : () => AST
->                               : ^^^^^^^^^
+>                               : ^^^^^^   
 >this : this
 >     : ^^^^
 >getScriptFragmentStartAST : () => AST
->                          : ^^^^^^^^^
+>                          : ^^^^^^   
 
                 var minChar = ast.minChar;
 >minChar : any
@@ -341,7 +341,7 @@ module TypeScript {
 
     export function preFindMemberScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindMemberScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                   : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                   : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -508,7 +508,7 @@ module TypeScript {
 
     export function pushTypeCollectionScope(container: Symbol,
 >pushTypeCollectionScope : (container: Symbol, valueMembers: ScopedMembers, ambientValueMembers: ScopedMembers, enclosedTypes: ScopedMembers, ambientEnclosedTypes: ScopedMembers, context: TypeCollectionContext, thisType: Type, classType: Type, moduleDecl: ModuleDeclaration) => void
->                        : ^         ^^      ^^            ^^^^^^^^^^^^^^^^^                   ^^^^^^^^^^^^^^^^^             ^^^^^^^^^^^^^^^^^                    ^^^^^^^^^^^^^^^^^       ^^                     ^^        ^^^^^^^^         ^^^^^^^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^         ^^      ^^            ^^             ^^                   ^^             ^^             ^^             ^^                    ^^             ^^       ^^                     ^^        ^^    ^^         ^^    ^^          ^^                 ^^^^^^^^^
 >container : Symbol
 >          : ^^^^^^
 
@@ -658,7 +658,7 @@ module TypeScript {
 
     export function preFindEnclosingScope(ast: AST, parent: AST, walker: IAstWalker) {
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -796,11 +796,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return script.bod === null ? null : script.bod.enclosingScope;                    } : () => any
 >                                                                                                                         : ^^^^^^^^^
 
@@ -853,11 +853,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return (ast.type === null || ast.type.instanceType.containedScope === null) ? null : ast.type.instanceType.containedScope;                    } : () => any
 >                                                                                                                                                                                     : ^^^^^^^^^
 
@@ -965,11 +965,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                                                    : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                            return objectLit.targetType.containedScope;                        } : () => any
 >                                                                                                              : ^^^^^^^^^
 
@@ -990,11 +990,11 @@ module TypeScript {
 >context.objectLiteralScopeGetter = function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                                                              : ^^^^^^^^^
 >context.objectLiteralScopeGetter : () => SymbolScope
->                                 : ^^^^^^^^^^^^^^^^^
+>                                 : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >objectLiteralScopeGetter : () => SymbolScope
->                         : ^^^^^^^^^^^^^^^^^
+>                         : ^^^^^^           
 >function () {                            return objectLit.targetType.memberScope;                        } : () => any
 >                                                                                                           : ^^^^^^^^^
 
@@ -1050,11 +1050,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                           : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return ast.type === null ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                     : ^^^^^^^^^
 
@@ -1107,11 +1107,11 @@ module TypeScript {
 >context.scopeGetter = function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                                             : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                        return (ast.type === null) ? null : ast.type.containedScope;                    } : () => any
 >                                                                                                                       : ^^^^^^^^^
 
@@ -1195,11 +1195,11 @@ module TypeScript {
 >context.scopeGetter = function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               : ^^^^^^^^^
 >context.scopeGetter : () => SymbolScope
->                    : ^^^^^^^^^^^^^^^^^
+>                    : ^^^^^^           
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 >scopeGetter : () => SymbolScope
->            : ^^^^^^^^^^^^^^^^^
+>            : ^^^^^^           
 >function () {                            // The scope of a class constructor is hidden somewhere we don't expect :-S                            if (funcDecl.isConstructor && hasFlag(funcDecl.fncFlags, FncFlags.ClassMethod)) {                                if (ast.type && ast.type.enclosingType) {                                    return ast.type.enclosingType.constructorScope;                                }                            }                            if (funcDecl.scopeType) {                                return funcDecl.scopeType.containedScope;                            }                            if (funcDecl.type) {                                return funcDecl.type.containedScope;                            }                            return null;                        } : () => any
 >                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         : ^^^^^^^^^
 
@@ -1371,7 +1371,7 @@ module TypeScript {
     //
     export function findEnclosingScopeAt(logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean): EnclosingScopeContext {
 >findEnclosingScopeAt : (logger: ILogger, script: Script, text: ISourceText, pos: number, isMemberCompletion: boolean) => EnclosingScopeContext
->                     : ^      ^^^^^^^^^^^      ^^^^^^^^^^    ^^^^^^^^^^^^^^^   ^^      ^^                  ^^       ^^^^^                     
+>                     : ^      ^^       ^^      ^^      ^^    ^^           ^^   ^^      ^^                  ^^       ^^^^^                     
 >logger : ILogger
 >       : ^^^^^^^
 >script : Script
@@ -1419,7 +1419,7 @@ module TypeScript {
 >script : Script
 >       : ^^^^^^
 >preFindEnclosingScope : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                      : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >context : EnclosingScopeContext
 >        : ^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserRealSource7.types b/tests/baselines/reference/parserRealSource7.types
index ac67b62fabd65..8b2d40b9c40ca 100644
--- a/tests/baselines/reference/parserRealSource7.types
+++ b/tests/baselines/reference/parserRealSource7.types
@@ -29,7 +29,7 @@ module TypeScript {
 
     function getBaseTypeLinks(bases: ASTList, baseTypeLinks: TypeLink[]) {
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >bases : ASTList
 >      : ^^^^^^^
 >baseTypeLinks : TypeLink[]
@@ -153,7 +153,7 @@ module TypeScript {
 
     function getBases(type: Type, typeDecl: TypeDeclaration) {
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >type : Type
 >     : ^^^^
 >typeDecl : TypeDeclaration
@@ -171,7 +171,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.extendsList, type.extendsTypeLinks) : TypeLink[]
 >                                                              : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.extendsList : any
 >                     : ^^^
 >typeDecl : TypeDeclaration
@@ -197,7 +197,7 @@ module TypeScript {
 >getBaseTypeLinks(typeDecl.implementsList, type.implementsTypeLinks) : TypeLink[]
 >                                                                    : ^^^^^^^^^^
 >getBaseTypeLinks : (bases: ASTList, baseTypeLinks: TypeLink[]) => TypeLink[]
->                 : ^     ^^^^^^^^^^^             ^^          ^^^^^^^^^^^^^^^
+>                 : ^     ^^       ^^             ^^          ^^^^^^^^^^^^^^^
 >typeDecl.implementsList : any
 >                        : ^^^
 >typeDecl : TypeDeclaration
@@ -214,7 +214,7 @@ module TypeScript {
 
     function addPrototypeField(classType: Type, ast: AST, context: TypeCollectionContext) {
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >ast : AST
@@ -389,7 +389,7 @@ module TypeScript {
 
     export function createNewConstructGroupForType(type: Type) {
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >type : Type
 >     : ^^^^
 
@@ -480,7 +480,7 @@ module TypeScript {
 
     export function cloneParentConstructGroupForChildType(child: Type, parent: Type) {
 >cloneParentConstructGroupForChildType : (child: Type, parent: Type) => void
->                                      : ^     ^^^^^^^^      ^^^^^^^^^^^^^^^
+>                                      : ^     ^^    ^^      ^^    ^^^^^^^^^
 >child : Type
 >      : ^^^^
 >parent : Type
@@ -518,7 +518,7 @@ module TypeScript {
 >createNewConstructGroupForType(parent) : void
 >                                       : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >parent : Type
 >       : ^^^^
         }
@@ -748,7 +748,7 @@ module TypeScript {
 
     function findTypeSymbolInScopeChain(name: string, scopeChain: ScopeChain): Symbol {
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain : ScopeChain
@@ -798,7 +798,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, scopeChain.previous) : Symbol
 >                                                      : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : string
 >     : ^^^^^^
 >scopeChain.previous : any
@@ -816,7 +816,7 @@ module TypeScript {
 
     function findSymbolFromAlias(alias: AST, context: IAliasScopeContext): Symbol {
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >alias : AST
 >      : ^^^
 >context : IAliasScopeContext
@@ -903,7 +903,7 @@ module TypeScript {
 >findTypeSymbolInScopeChain(name, context.topLevelScope) : Symbol
 >                                                        : ^^^^^^
 >findTypeSymbolInScopeChain : (name: string, scopeChain: ScopeChain) => Symbol
->                           : ^    ^^      ^^          ^^^^^^^^^^^^^^^^^      
+>                           : ^    ^^      ^^          ^^          ^^^^^      
 >name : any
 >     : ^^^
 >context.topLevelScope : ScopeChain
@@ -1001,7 +1001,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand1, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >dottedExpr.operand1 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1033,7 +1033,7 @@ module TypeScript {
 >findSymbolFromAlias(dottedExpr.operand2, context) : Symbol
 >                                                  : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >dottedExpr.operand2 : any
 >                    : ^^^
 >dottedExpr : BinaryExpression
@@ -1110,7 +1110,7 @@ module TypeScript {
 
     export function preCollectImportTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -1171,7 +1171,7 @@ module TypeScript {
 >findSymbolFromAlias(importDecl.alias, { topLevelScope: scopeChain, members: null, tcContext: context }) : Symbol
 >                                                                                                        : ^^^^^^
 >findSymbolFromAlias : (alias: AST, context: IAliasScopeContext) => Symbol
->                    : ^     ^^^^^^^       ^^                  ^^^^^      
+>                    : ^     ^^   ^^       ^^                  ^^^^^      
 >importDecl.alias : any
 >                 : ^^^
 >importDecl : ImportDeclaration
@@ -1464,7 +1464,7 @@ module TypeScript {
 
     export function preCollectModuleTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -2586,7 +2586,7 @@ module TypeScript {
 
     export function preCollectClassTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3140,7 +3140,7 @@ module TypeScript {
 >addPrototypeField(classType, classDecl, context) : void
 >                                                 : ^^^^
 >addPrototypeField : (classType: Type, ast: AST, context: TypeCollectionContext) => void
->                  : ^         ^^^^^^^^   ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                  : ^         ^^    ^^   ^^   ^^       ^^                     ^^^^^^^^^
 >classType : Type
 >          : ^^^^
 >classDecl : ClassDeclaration
@@ -3806,7 +3806,7 @@ module TypeScript {
 >createNewConstructGroupForType(classDecl.type) : void
 >                                               : ^^^^
 >createNewConstructGroupForType : (type: Type) => void
->                               : ^    ^^^^^^^^^^^^^^^
+>                               : ^    ^^    ^^^^^^^^^
 >classDecl.type : any
 >               : ^^^
 >classDecl : ClassDeclaration
@@ -3851,7 +3851,7 @@ module TypeScript {
 >getBases(instanceType, classDecl) : void
 >                                  : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >instanceType : Type
 >             : ^^^^
 >classDecl : ClassDeclaration
@@ -3892,7 +3892,7 @@ module TypeScript {
 
     export function preCollectInterfaceTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4244,7 +4244,7 @@ module TypeScript {
 >getBases(interfaceType, interfaceDecl) : void
 >                                       : ^^^^
 >getBases : (type: Type, typeDecl: TypeDeclaration) => void
->         : ^    ^^^^^^^^        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>         : ^    ^^    ^^        ^^               ^^^^^^^^^
 >interfaceType : Type
 >              : ^^^^
 >interfaceDecl : InterfaceDeclaration
@@ -4393,7 +4393,7 @@ module TypeScript {
 
     export function preCollectArgDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -4696,7 +4696,7 @@ module TypeScript {
 
     export function preCollectVarDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -5568,7 +5568,7 @@ module TypeScript {
 
     export function preCollectFuncDeclTypes(ast: AST, parent: AST, context: TypeCollectionContext) {
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7455,7 +7455,7 @@ module TypeScript {
 
     export function preCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >preCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7581,7 +7581,7 @@ module TypeScript {
 >preCollectImportTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectImportTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7637,7 +7637,7 @@ module TypeScript {
 >preCollectModuleTypes(ast, parent, context) : boolean
 >                                            : ^^^^^^^
 >preCollectModuleTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                      : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7669,7 +7669,7 @@ module TypeScript {
 >preCollectClassTypes(ast, parent, context) : boolean
 >                                           : ^^^^^^^
 >preCollectClassTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                     : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7725,7 +7725,7 @@ module TypeScript {
 >preCollectInterfaceTypes(ast, parent, context) : boolean
 >                                               : ^^^^^^^
 >preCollectInterfaceTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                         : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7759,7 +7759,7 @@ module TypeScript {
 >preCollectArgDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectArgDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7791,7 +7791,7 @@ module TypeScript {
 >preCollectVarDeclTypes(ast, parent, context) : boolean
 >                                             : ^^^^^^^
 >preCollectVarDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                       : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7823,7 +7823,7 @@ module TypeScript {
 >preCollectFuncDeclTypes(ast, parent, context) : boolean
 >                                              : ^^^^^^^
 >preCollectFuncDeclTypes : (ast: AST, parent: AST, context: TypeCollectionContext) => boolean
->                        : ^   ^^^^^^^      ^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                        : ^   ^^   ^^      ^^   ^^       ^^                     ^^^^^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -7896,7 +7896,7 @@ module TypeScript {
 
     export function postCollectTypes(ast: AST, parent: AST, walker: IAstWalker) {
 >postCollectTypes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource8.types b/tests/baselines/reference/parserRealSource8.types
index d5273187496c0..011cf47ae9f94 100644
--- a/tests/baselines/reference/parserRealSource8.types
+++ b/tests/baselines/reference/parserRealSource8.types
@@ -30,7 +30,7 @@ module TypeScript {
 
     export function pushAssignScope(scope: SymbolScope,
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 
@@ -317,7 +317,7 @@ module TypeScript {
 
     export function preAssignModuleScopes(ast: AST, context: AssignScopeContext) {
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -540,7 +540,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -614,7 +614,7 @@ module TypeScript {
 
     export function preAssignClassScopes(ast: AST, context: AssignScopeContext) {
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -887,7 +887,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, instanceType, classType, null) : void
 >                                                                  : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -934,7 +934,7 @@ module TypeScript {
 
     export function preAssignInterfaceScopes(ast: AST, context: AssignScopeContext) {
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1097,7 +1097,7 @@ module TypeScript {
 >pushAssignScope(aggScope, context, null, null, null) : void
 >                                                     : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >aggScope : SymbolAggregateScope
 >         : ^^^^^^^^^^^^^^^^^^^^
 >context : AssignScopeContext
@@ -1118,7 +1118,7 @@ module TypeScript {
 
     export function preAssignWithScopes(ast: AST, context: AssignScopeContext) {
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -1326,7 +1326,7 @@ module TypeScript {
 >pushAssignScope(withScope, context, null, null, null) : void
 >                                                      : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >withScope : any
 >          : ^^^
 >context : AssignScopeContext
@@ -1347,7 +1347,7 @@ module TypeScript {
 
     export function preAssignFuncDeclScopes(ast: AST, context: AssignScopeContext) {
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3274,7 +3274,7 @@ module TypeScript {
 >pushAssignScope(locals, context, thisType, null, funcDecl) : void
 >                                                           : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >locals : any
 >       : ^^^
 >context : AssignScopeContext
@@ -3288,7 +3288,7 @@ module TypeScript {
 
     export function preAssignCatchScopes(ast: AST, context: AssignScopeContext) {
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3382,7 +3382,7 @@ module TypeScript {
 >pushAssignScope(catchLocals, context, context.scopeChain.thisType, context.scopeChain.classType, context.scopeChain.fnc) : void
 >                                                                                                                         : ^^^^
 >pushAssignScope : (scope: SymbolScope, context: AssignScopeContext, type: Type, classType: Type, fnc: FuncDecl) => void
->                : ^     ^^^^^^^^^^^^^^^       ^^                  ^^    ^^^^^^^^         ^^^^^^^^   ^^^^^^^^^^^^^^^^^^^
+>                : ^     ^^           ^^       ^^                  ^^    ^^    ^^         ^^    ^^   ^^        ^^^^^^^^^
 >catchLocals : any
 >            : ^^^
 >context : AssignScopeContext
@@ -3422,7 +3422,7 @@ module TypeScript {
 
     export function preAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >preAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
@@ -3514,7 +3514,7 @@ module TypeScript {
 >preAssignModuleScopes(ast, context) : void
 >                                    : ^^^^
 >preAssignModuleScopes : (ast: AST, context: AssignScopeContext) => void
->                      : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                      : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3540,7 +3540,7 @@ module TypeScript {
 >preAssignClassScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignClassScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3566,7 +3566,7 @@ module TypeScript {
 >preAssignInterfaceScopes(ast, context) : void
 >                                       : ^^^^
 >preAssignInterfaceScopes : (ast: AST, context: AssignScopeContext) => void
->                         : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                         : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3592,7 +3592,7 @@ module TypeScript {
 >preAssignWithScopes(ast, context) : void
 >                                  : ^^^^
 >preAssignWithScopes : (ast: AST, context: AssignScopeContext) => void
->                    : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                    : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3618,7 +3618,7 @@ module TypeScript {
 >preAssignFuncDeclScopes(ast, context) : void
 >                                      : ^^^^
 >preAssignFuncDeclScopes : (ast: AST, context: AssignScopeContext) => void
->                        : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                        : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3644,7 +3644,7 @@ module TypeScript {
 >preAssignCatchScopes(ast, context) : void
 >                                   : ^^^^
 >preAssignCatchScopes : (ast: AST, context: AssignScopeContext) => void
->                     : ^   ^^^^^^^       ^^                  ^^^^^^^^^
+>                     : ^   ^^   ^^       ^^                  ^^^^^^^^^
 >ast : AST
 >    : ^^^
 >context : AssignScopeContext
@@ -3698,7 +3698,7 @@ module TypeScript {
 
     export function postAssignScopes(ast: AST, parent: AST, walker: IAstWalker) {
 >postAssignScopes : (ast: AST, parent: AST, walker: IAstWalker) => AST
->                 : ^   ^^^^^^^      ^^^^^^^      ^^^^^^^^^^^^^^^^^^^^
+>                 : ^   ^^   ^^      ^^   ^^      ^^          ^^^^^^^^
 >ast : AST
 >    : ^^^
 >parent : AST
diff --git a/tests/baselines/reference/parserRealSource9.types b/tests/baselines/reference/parserRealSource9.types
index cde69fbfba44a..ab395310ba98b 100644
--- a/tests/baselines/reference/parserRealSource9.types
+++ b/tests/baselines/reference/parserRealSource9.types
@@ -20,7 +20,7 @@ module TypeScript {
 
         public resolveBaseTypeLinks(typeLinks: TypeLink[], scope: SymbolScope) {
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >typeLinks : TypeLink[]
 >          : ^^^^^^^^^^
 >scope : SymbolScope
@@ -194,7 +194,7 @@ module TypeScript {
 
         public resolveBases(scope: SymbolScope, type: Type) {
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>             : ^     ^^           ^^    ^^    ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -212,11 +212,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.extendsTypeLinks, scope) : Type[]
 >                                                        : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >type.extendsTypeLinks : any
 >                      : ^^^
 >type : Type
@@ -452,11 +452,11 @@ module TypeScript {
 >this.resolveBaseTypeLinks(type.implementsTypeLinks, scope) : Type[]
 >                                                           : ^^^^^^
 >this.resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                          : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBaseTypeLinks : (typeLinks: TypeLink[], scope: SymbolScope) => Type[]
->                     : ^         ^^          ^^     ^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^         ^^          ^^     ^^           ^^^^^^^^^^^
 >type.implementsTypeLinks : any
 >                         : ^^^
 >type : Type
@@ -589,7 +589,7 @@ module TypeScript {
 
         public resolveSignatureGroup(signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) {
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >signatureGroup : SignatureGroup
 >               : ^^^^^^^^^^^^^^
 >scope : SymbolScope
@@ -732,11 +732,11 @@ module TypeScript {
 >this.bindSymbol(scope, signature.parameters[j]) : void
 >                                                : ^^^^
 >this.bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->                : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>                : ^     ^^           ^^      ^^      ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>           : ^     ^^           ^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >signature.parameters[j] : any
@@ -887,7 +887,7 @@ module TypeScript {
 
         public bindType(scope: SymbolScope, type: Type, instanceType: Type): void {
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -903,11 +903,11 @@ module TypeScript {
 >this.bindType(scope, instanceType, null) : void
 >                                         : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >instanceType : Type
@@ -1115,11 +1115,11 @@ module TypeScript {
 >this.bind(agg, type.members.allMembers) : void
 >                                        : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >type.members.allMembers : any
@@ -1141,11 +1141,11 @@ module TypeScript {
 >this.bind(agg, typeMembers.allMembers) : void
 >                                       : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >typeMembers.allMembers : any
@@ -1163,11 +1163,11 @@ module TypeScript {
 >this.bind(agg, ambientMembers.allMembers) : void
 >                                          : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientMembers.allMembers : any
@@ -1185,11 +1185,11 @@ module TypeScript {
 >this.bind(agg, ambientTypeMembers.allMembers) : void
 >                                              : ^^^^
 >this.bind : (scope: SymbolScope, table: IHashTable) => void
->          : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>          : ^     ^^           ^^     ^^          ^^^^^^^^^
 >this : this
 >     : ^^^^
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >agg : any
 >    : ^^^
 >ambientTypeMembers.allMembers : any
@@ -1243,11 +1243,11 @@ module TypeScript {
 >this.resolveBases(scope, type) : void
 >                               : ^^^^
 >this.resolveBases : (scope: SymbolScope, type: Type) => void
->                  : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>                  : ^     ^^           ^^    ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveBases : (scope: SymbolScope, type: Type) => void
->             : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^
+>             : ^     ^^           ^^    ^^    ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type : Type
@@ -1265,11 +1265,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.construct, scope, instanceType) : void
 >                                                                : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.construct : any
 >               : ^^^
 >type : Type
@@ -1293,11 +1293,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.call, scope, null) : void
 >                                                   : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.call : any
 >          : ^^^
 >type : Type
@@ -1319,11 +1319,11 @@ module TypeScript {
 >this.resolveSignatureGroup(type.index, scope, null) : void
 >                                                    : ^^^^
 >this.resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                           : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                           : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >this : this
 >     : ^^^^
 >resolveSignatureGroup : (signatureGroup: SignatureGroup, scope: SymbolScope, instanceType: Type) => void
->                      : ^              ^^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^
+>                      : ^              ^^              ^^     ^^           ^^            ^^    ^^^^^^^^^
 >type.index : any
 >           : ^^^
 >type : Type
@@ -1345,11 +1345,11 @@ module TypeScript {
 >this.bindType(scope, type.elementType, null) : void
 >                                             : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >type.elementType : any
@@ -1363,7 +1363,7 @@ module TypeScript {
 
         public bindSymbol(scope: SymbolScope, symbol: Symbol) {
 >bindSymbol : (scope: SymbolScope, symbol: Symbol) => void
->           : ^     ^^^^^^^^^^^^^^^      ^^      ^^^^^^^^^
+>           : ^     ^^           ^^      ^^      ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >symbol : Symbol
@@ -1715,11 +1715,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.type, typeSymbol.instanceType) : void
 >                                                               : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.type : any
@@ -1778,11 +1778,11 @@ module TypeScript {
 >this.bindType(scope, typeSymbol.expansions[i], typeSymbol.instanceType) : void
 >                                                                        : ^^^^
 >this.bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->              : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>              : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >this : this
 >     : ^^^^
 >bindType : (scope: SymbolScope, type: Type, instanceType: Type) => void
->         : ^     ^^^^^^^^^^^^^^^    ^^^^^^^^            ^^^^^^^^^^^    
+>         : ^     ^^           ^^    ^^    ^^            ^^    ^^^^^    
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >typeSymbol.expansions[i] : any
@@ -1925,7 +1925,7 @@ module TypeScript {
 
         public bind(scope: SymbolScope, table: IHashTable) {
 >bind : (scope: SymbolScope, table: IHashTable) => void
->     : ^     ^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^
+>     : ^     ^^           ^^     ^^          ^^^^^^^^^
 >scope : SymbolScope
 >      : ^^^^^^^^^^^
 >table : IHashTable
diff --git a/tests/baselines/reference/parserUnterminatedGeneric1.types b/tests/baselines/reference/parserUnterminatedGeneric1.types
index 12c025090c4b2..549ca935c184d 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric1.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric1.types
@@ -4,7 +4,7 @@
  interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^^^^^^^^^
+>    : ^        ^^               ^^^^^        
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserUnterminatedGeneric2.types b/tests/baselines/reference/parserUnterminatedGeneric2.types
index 2f5be1ab9ff4c..b947eed9d1388 100644
--- a/tests/baselines/reference/parserUnterminatedGeneric2.types
+++ b/tests/baselines/reference/parserUnterminatedGeneric2.types
@@ -39,7 +39,7 @@ declare module ng {
     interface IQService {
         all(promises: IPromise < any > []): IPromise<
 >all : (promises: IPromise<any>[]) => IPromise
->    : ^        ^^               ^^^^^^^^^^^^^
+>    : ^        ^^               ^^^^^        
 >promises : IPromise<any>[]
 >         : ^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.types b/tests/baselines/reference/parserX_ArrowFunction1.types
index 9231ec5c45df6..b81026b7751d5 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.types
+++ b/tests/baselines/reference/parserX_ArrowFunction1.types
@@ -3,9 +3,9 @@
 === parserX_ArrowFunction1.ts ===
 var v = (a: ) => {
 >v : (a: any) => void
->  : ^ ^^^^^^^^^^^^^^
+>  : ^ ^^   ^^^^^^^^^
 >(a: ) => {   } : (a: any) => void
->               : ^ ^^^^^^^^^^^^^^
+>               : ^ ^^   ^^^^^^^^^
 >a : any
 >  : ^^^
    
diff --git a/tests/baselines/reference/parserharness.types b/tests/baselines/reference/parserharness.types
index 2828e5164aaf3..0326d8453ba19 100644
--- a/tests/baselines/reference/parserharness.types
+++ b/tests/baselines/reference/parserharness.types
@@ -4320,7 +4320,7 @@ module Harness {
             /** create file gets the whole path to create, so this works as expected with the --out parameter */
             public createFile(s: string, useUTF8?: boolean): ITextWriter {
 >createFile : (s: string, useUTF8?: boolean) => ITextWriter
->           : ^ ^^      ^^       ^^^       ^^^^^^^^^^^^^^^^
+>           : ^ ^^      ^^       ^^^       ^^^^^           
 >s : string
 >  : ^^^^^^
 >useUTF8 : boolean
@@ -4687,7 +4687,7 @@ module Harness {
 
         export function makeDefaultCompilerForTest(c?: TypeScript.TypeScriptCompiler) {
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^ ^^^                             ^^^^^^^^
 >c : TypeScript.TypeScriptCompiler
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -6448,11 +6448,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^              ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6602,11 +6602,11 @@ module Harness {
 >this.getTypeInfoName(tyInfo.ast) : string
 >                                 : ^^^^^^
 >this.getTypeInfoName : (ast: TypeScript.AST) => string
->                     : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^   ^^              ^^^^^^^^^^^
 >this : this
 >     : ^^^^
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >tyInfo.ast : any
 >           : ^^^
 >tyInfo : any
@@ -6816,7 +6816,7 @@ module Harness {
 
             private getTypeInfoName(ast : TypeScript.AST) {
 >getTypeInfoName : (ast: TypeScript.AST) => string
->                : ^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^   ^^              ^^^^^^^^^^^
 >ast : TypeScript.AST
 >    : ^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8329,7 +8329,7 @@ module Harness {
 >makeDefaultCompilerForTest() : any
 >                             : ^^^
 >makeDefaultCompilerForTest : (c?: TypeScript.TypeScriptCompiler) => any
->                           : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^ ^^^                             ^^^^^^^^
 
             if (usePull) {
 >usePull : boolean
@@ -8733,7 +8733,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8797,7 +8797,7 @@ module Harness {
 >callback : (res: CompilerResult) => void
 >         : ^   ^^              ^^^^^    
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >context : CompilationContext
 >        : ^^^^^^^^^^^^^^^^^^
 >references : TypeScript.IFileReference[]
@@ -8816,7 +8816,7 @@ module Harness {
 >res : CompilerResult
 >    : ^^^^^^^^^^^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >settings : TypeScript.CompilationSettings
 >         : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -8931,13 +8931,13 @@ module Harness {
 
             if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 
                 settingsCallback(compiler.settings);
 >settingsCallback(compiler.settings) : void
 >                                    : ^^^^
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 >compiler.settings : any
 >                  : ^^^
 >compiler : TypeScript.TypeScriptCompiler
@@ -8991,7 +8991,7 @@ module Harness {
                 // So that a test doesn't have side effects for tests run after it, restore the compiler settings to their previous state.
                 if (settingsCallback) {
 >settingsCallback : (settings?: TypeScript.CompilationSettings) => void
->                 : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^    
+>                 : ^        ^^^                              ^^^^^    
 
                     compiler.settings = oldCompilerSettings;
 >compiler.settings = oldCompilerSettings : any
@@ -9184,7 +9184,7 @@ module Harness {
 
         export function emit(ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) {
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >ioHost : TypeScript.EmitterIOHost
 >       : ^^^^^^^^^^^^^^^^^^^^^^^^
 >TypeScript : any
@@ -9360,7 +9360,7 @@ module Harness {
 >emit(stdout, true) : void
 >                   : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >true : true
@@ -9383,7 +9383,7 @@ module Harness {
 >emit(stdout, false) : void
 >                    : ^^^^
 >emit : (ioHost: TypeScript.EmitterIOHost, usePullEmitter?: boolean) => void
->     : ^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^              ^^^       ^^^^^^^^^
+>     : ^      ^^                        ^^              ^^^       ^^^^^^^^^
 >stdout : EmitterIOHost
 >       : ^^^^^^^^^^^^^
 >false : false
@@ -10326,7 +10326,7 @@ module Harness {
 
         public editRanges: { length: number; editRange: TypeScript.ScriptEditRange; }[] = [];
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >editRange : TypeScript.ScriptEditRange
@@ -10371,11 +10371,11 @@ module Harness {
 >this.editRanges = [] : undefined[]
 >                     : ^^^^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >[] : undefined[]
 >   : ^^^^^^^^^^^
 
@@ -10494,15 +10494,15 @@ module Harness {
 >this.editRanges.push({                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            }) : number
 >                                                                                                                                                                                                  : ^^^^^^
 >this.editRanges.push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >push : (...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => number
->     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>     : ^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^      
 >{                length: this.content.length,                editRange: new TypeScript.ScriptEditRange(minChar, limChar, (limChar - minChar) + newText.length)            } : { length: number; editRange: any; }
 >                                                                                                                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -10560,11 +10560,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >this.maxScriptVersions : number
@@ -10576,17 +10576,17 @@ module Harness {
 
                 this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length);
 >this.editRanges.splice(0, this.maxScriptVersions - this.editRanges.length) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                                           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >splice : { (start: number, deleteCount?: number): { length: number; editRange: TypeScript.ScriptEditRange; }[]; (start: number, deleteCount: number, ...items: { length: number; editRange: TypeScript.ScriptEditRange; }[]): { length: number; editRange: TypeScript.ScriptEditRange; }[]; }
->       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>       : ^^^     ^^      ^^           ^^^      ^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^     ^^      ^^           ^^      ^^^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^
 >0 : 0
 >  : ^
 >this.maxScriptVersions - this.editRanges.length : number
@@ -10600,11 +10600,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
             }
@@ -10623,7 +10623,7 @@ module Harness {
 
         public getEditRangeSinceVersion(version: number): TypeScript.ScriptEditRange {
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^       ^^      ^^^^^                          
 >version : number
 >        : ^^^^^^
 >TypeScript : any
@@ -10653,11 +10653,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 >(this.version - version) : number
@@ -10689,11 +10689,11 @@ module Harness {
 >this.editRanges.length : number
 >                       : ^^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -10715,19 +10715,19 @@ module Harness {
 
             var entries = this.editRanges.slice(initialEditRangeIndex);
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.slice(initialEditRangeIndex) : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                             : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges.slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this.editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->                : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >this : this
 >     : ^^^^
 >editRanges : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >slice : (start?: number, end?: number) => { length: number; editRange: TypeScript.ScriptEditRange; }[]
->      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>      : ^     ^^^      ^^   ^^^      ^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >initialEditRangeIndex : number
 >                      : ^^^^^^
 
@@ -10741,21 +10741,21 @@ module Harness {
 >entries.map(x => x.editRange.minChar) : any[]
 >                                      : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.minChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.editRange.minChar : any
 >                    : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -10791,21 +10791,21 @@ module Harness {
 >entries.map(x => x.length - x.editRange.limChar) : number[]
 >                                                 : ^^^^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.length - x.editRange.limChar : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => number
->                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.length - x.editRange.limChar : number
 >                               : ^^^^^^
 >x.length : number
 >         : ^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >length : number
 >       : ^^^^^^
 >x.editRange.limChar : any
@@ -10813,7 +10813,7 @@ module Harness {
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >limChar : any
@@ -10849,21 +10849,21 @@ module Harness {
 >entries.map(x => x.editRange.delta) : any[]
 >                                    : ^^^^^
 >entries.map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>            : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >map : <U>(callbackfn: (value: { length: number; editRange: TypeScript.ScriptEditRange; }, index: number, array: { length: number; editRange: TypeScript.ScriptEditRange; }[]) => U, thisArg?: any) => U[]
->    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^   ^^^^^^^^
+>    : ^ ^^          ^^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^     ^^      ^^     ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^^^       ^^^   ^^^^^^^^
 >x => x.editRange.delta : (x: { length: number; editRange: TypeScript.ScriptEditRange; }) => any
->                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                       : ^ ^^^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >x.editRange.delta : any
 >                  : ^^^
 >x.editRange : TypeScript.ScriptEditRange
 >            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >x : { length: number; editRange: TypeScript.ScriptEditRange; }
->  : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>  : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >editRange : TypeScript.ScriptEditRange
 >          : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >delta : any
@@ -10899,9 +10899,9 @@ module Harness {
 >entries[0].length : number
 >                  : ^^^^^^
 >entries[0] : { length: number; editRange: TypeScript.ScriptEditRange; }
->           : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>           : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^
 >entries : { length: number; editRange: TypeScript.ScriptEditRange; }[]
->        : ^^^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^^^      ^^^^^^^^^^^^^                          ^^^^^
 >0 : 0
 >  : ^
 >length : number
@@ -11495,7 +11495,7 @@ module Harness {
 >this.scripts[scriptIndex].getEditRangeSinceVersion(scriptVersion) : TypeScript.ScriptEditRange
 >                                                                  : ^^^^^^^^^^^^^^^^^^^^^^^^^^
 >this.scripts[scriptIndex].getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                                                   : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                                   : ^       ^^      ^^^^^                          
 >this.scripts[scriptIndex] : ScriptInfo
 >                          : ^^^^^^^^^^
 >this.scripts : ScriptInfo[]
@@ -11507,7 +11507,7 @@ module Harness {
 >scriptIndex : number
 >            : ^^^^^^
 >getEditRangeSinceVersion : (version: number) => TypeScript.ScriptEditRange
->                         : ^       ^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                         : ^       ^^      ^^^^^                          
 >scriptVersion : number
 >              : ^^^^^^
 
@@ -11557,7 +11557,7 @@ module Harness {
          */
         public getLanguageService(): Services.ILanguageServiceShim {
 >getLanguageService : () => Services.ILanguageServiceShim
->                   : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                   : ^^^^^^                             
 >Services : any
 >         : ^^^
 
@@ -11613,7 +11613,7 @@ module Harness {
         /** Parse file given its source text */
         public parseSourceText(fileName: string, sourceText: TypeScript.ISourceText): TypeScript.Script {
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^        ^^      ^^          ^^                      ^^^^^                 
 >fileName : string
 >         : ^^^^^^
 >sourceText : TypeScript.ISourceText
@@ -11721,11 +11721,11 @@ module Harness {
 >this.parseSourceText(fileName, sourceText) : TypeScript.Script
 >                                           : ^^^^^^^^^^^^^^^^^
 >this.parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                     : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                     : ^        ^^      ^^          ^^                      ^^^^^                 
 >this : this
 >     : ^^^^
 >parseSourceText : (fileName: string, sourceText: TypeScript.ISourceText) => TypeScript.Script
->                : ^        ^^      ^^          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                : ^        ^^      ^^          ^^                      ^^^^^                 
 >fileName : string
 >         : ^^^^^^
 >sourceText : any
@@ -11871,7 +11871,7 @@ module Harness {
         */
         public positionToZeroBasedLineCol(fileName: string, position: number): TypeScript.ILineCol {
 >positionToZeroBasedLineCol : (fileName: string, position: number) => TypeScript.ILineCol
->                           : ^        ^^      ^^        ^^      ^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^        ^^      ^^        ^^      ^^^^^                   
 >fileName : string
 >         : ^^^^^^
 >position : number
@@ -12279,25 +12279,25 @@ module Harness {
 
             var temp = mapEdits(edits).sort(function (a, b) {
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort(function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            }) : { edit: Services.TextEdit; index: number; }[]
->                                                                                                                                                                                                                               : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                                                                                                                                                                                                                               : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits).sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->                     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits(edits) : { edit: Services.TextEdit; index: number; }[]
->                : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>                : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >mapEdits : (edits: Services.TextEdit[]) => { edit: Services.TextEdit; index: number; }[]
 >         : ^     ^^                   ^^^^^                                             
 >edits : Services.TextEdit[]
 >      : ^^^^^^^^^^^^^^^^^^^
 >sort : (compareFn?: (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number) => { edit: Services.TextEdit; index: number; }[]
->     : ^         ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^         ^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^      ^^^^^^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >function (a, b) {                var result = a.edit.minChar - b.edit.minChar;                if (result == 0)                    result = a.index - b.index;                return result;            } : (a: { edit: Services.TextEdit; index: number; }, b: { edit: Services.TextEdit; index: number; }) => number
->                                                                                                                                                                                                         : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^^^^^^^^^^
+>                                                                                                                                                                                                         : ^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^ ^^^^^^^^^^                 ^^^^^^^^^      ^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 
                 var result = a.edit.minChar - b.edit.minChar;
 >result : number
@@ -12309,7 +12309,7 @@ module Harness {
 >a.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12319,7 +12319,7 @@ module Harness {
 >b.edit : Services.TextEdit
 >       : ^^^^^^^^^^^^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >edit : Services.TextEdit
 >     : ^^^^^^^^^^^^^^^^^
 >minChar : any
@@ -12343,13 +12343,13 @@ module Harness {
 >a.index : number
 >        : ^^^^^^
 >a : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 >b.index : number
 >        : ^^^^^^
 >b : { edit: Services.TextEdit; index: number; }
->  : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>  : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >index : number
 >      : ^^^^^^
 
@@ -12379,7 +12379,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12389,9 +12389,9 @@ module Harness {
 >temp[current].edit : Services.TextEdit
 >                   : ^^^^^^^^^^^^^^^^^
 >temp[current] : { edit: Services.TextEdit; index: number; }
->              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>              : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >current : number
 >        : ^^^^^^
 >edit : Services.TextEdit
@@ -12406,7 +12406,7 @@ module Harness {
 >temp.length : number
 >            : ^^^^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >length : number
 >       : ^^^^^^
 
@@ -12436,9 +12436,9 @@ module Harness {
 >temp[next].edit : Services.TextEdit
 >                : ^^^^^^^^^^^^^^^^^
 >temp[next] : { edit: Services.TextEdit; index: number; }
->           : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^
+>           : ^^^^^^^^                 ^^^^^^^^^      ^^^
 >temp : { edit: Services.TextEdit; index: number; }[]
->     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ^^^^^
+>     : ^^^^^^^^                 ^^^^^^^^^      ^^^^^
 >next : number
 >     : ^^^^^^
 >edit : Services.TextEdit
diff --git a/tests/baselines/reference/parserindenter.types b/tests/baselines/reference/parserindenter.types
index 773edd88ec266..0d93f460d18e4 100644
--- a/tests/baselines/reference/parserindenter.types
+++ b/tests/baselines/reference/parserindenter.types
@@ -145,11 +145,11 @@ module Formatting {
 >this.ApplyScriptBlockIndentation(this.languageHostIndentation, this.tree) : void
 >                                                                          : ^^^^
 >this.ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                                 : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                                 : ^                       ^^      ^^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                            : ^                       ^^      ^^    ^^         ^^^^^    
 >this.languageHostIndentation : string
 >                             : ^^^^^^
 >this : this
@@ -167,11 +167,11 @@ module Formatting {
 >this.FillInheritedIndentation(this.tree) : void
 >                                         : ^^^^
 >this.FillInheritedIndentation : (tree: ParseTree) => void
->                              : ^    ^^^^^^^^^^^^^^^^    
+>                              : ^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^^^^^^^^^^^^^^^    
+>                         : ^    ^^         ^^^^^    
 >this.tree : ParseTree
 >          : ^^^^^^^^^
 >this : this
@@ -183,7 +183,7 @@ module Formatting {
 
         public GetIndentationEdits(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEdits : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                    : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                    : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -332,11 +332,11 @@ module Formatting {
 >this.GetIndentationEditsWorker(token, nextToken, node, sameLineIndent) : List_TextEditInfo
 >                                                                       : ^^^^^^^^^^^^^^^^^
 >this.GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                               : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                               : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >this : this
 >     : ^^^^
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -477,7 +477,7 @@ module Formatting {
 
         public GetIndentationEditsWorker(token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean): List_TextEditInfo {
 >GetIndentationEditsWorker : (token: TokenSpan, nextToken: TokenSpan, node: ParseNode, sameLineIndent: boolean) => List_TextEditInfo
->                          : ^     ^^^^^^^^^^^^^         ^^^^^^^^^^^^^    ^^^^^^^^^^^^^              ^^       ^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^         ^^         ^^    ^^         ^^              ^^       ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 >nextToken : TokenSpan
@@ -513,11 +513,11 @@ module Formatting {
 >this.AdjustStartOffsetIfNeeded(token, node) : void
 >                                            : ^^^^
 >this.AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                               : ^     ^^         ^^    ^^         ^^^^^    
 >this : this
 >     : ^^^^
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                          : ^     ^^         ^^    ^^         ^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -558,11 +558,11 @@ module Formatting {
 >this.IsMultiLineString(token) : boolean
 >                              : ^^^^^^^
 >this.IsMultiLineString : (token: TokenSpan) => boolean
->                       : ^     ^^^^^^^^^^^^^^^^       
+>                       : ^     ^^         ^^^^^       
 >this : this
 >     : ^^^^
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^^^^^^^^^^^^^^^       
+>                  : ^     ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -580,11 +580,11 @@ module Formatting {
 >this.GetSpecialCaseIndentation(token, node) : IndentationInfo
 >                                            : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                               : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                               : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -811,11 +811,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                     : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -837,11 +837,11 @@ module Formatting {
 >this.GetIndentEdit(indentationInfo, token.Span.startPosition(), sameLineIndent) : TextEditInfo
 >                                                                                : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >indentationInfo : IndentationInfo
 >                : ^^^^^^^^^^^^^^^
 >token.Span.startPosition() : any
@@ -869,11 +869,11 @@ module Formatting {
 >this.RegisterIndentation(edit, sameLineIndent) : void
 >                                               : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                         : ^      ^^            ^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >edit : TextEditInfo
 >     : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -914,11 +914,11 @@ module Formatting {
 >this.GetCommentIndentationEdits(token) : List_TextEditInfo
 >                                       : ^^^^^^^^^^^^^^^^^
 >this.GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                                : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^^^^                 
 >this : this
 >     : ^^^^
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^     ^^         ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -960,7 +960,7 @@ module Formatting {
 
         private GetCommentIndentationEdits(token: TokenSpan): List_TextEditInfo {
 >GetCommentIndentationEdits : (token: TokenSpan) => List_TextEditInfo
->                           : ^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                           : ^     ^^         ^^^^^                 
 >token : TokenSpan
 >      : ^^^^^^^^^
 
@@ -1140,11 +1140,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(lineIndent, commentFirstLineIndentationDelta) : IndentationInfo
 >                                                                          : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^             ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >lineIndent : string
 >           : ^^^^^^
 >commentFirstLineIndentationDelta : number
@@ -1176,11 +1176,11 @@ module Formatting {
 >this.GetIndentEdit(commentIndentationInfo, tokenStartPosition, false) : TextEditInfo
 >                                                                      : ^^^^^^^^^^^^
 >this.GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->                   : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>                   : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >this : this
 >     : ^^^^
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >commentIndentationInfo : IndentationInfo
 >                       : ^^^^^^^^^^^^^^^
 >tokenStartPosition : any
@@ -1217,7 +1217,7 @@ module Formatting {
 
         static GetIndentSizeFromIndentText(indentText: string, editorOptions: Services.EditorOptions): number {
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >indentText : string
 >           : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1240,7 +1240,7 @@ module Formatting {
 
         static GetIndentSizeFromText(text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean): number {
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >text : string
 >     : ^^^^^^
 >editorOptions : Services.EditorOptions
@@ -1371,7 +1371,7 @@ module Formatting {
 
         private GetSpecialCaseIndentation(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentation : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                          : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1405,11 +1405,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForLCurly(node) : IndentationInfo
 >                                              : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                        : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                        : ^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                   : ^    ^^         ^^^^^               
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1605,11 +1605,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForSemicolon(token, node) : IndentationInfo
 >                                                        : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                           : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                           : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1627,11 +1627,11 @@ module Formatting {
 >this.GetSpecialCaseIndentationForComment(token, node) : IndentationInfo
 >                                                      : ^^^^^^^^^^^^^^^
 >this.GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                         : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                         : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1646,7 +1646,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForLCurly(node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForLCurly : (node: ParseNode) => IndentationInfo
->                                   : ^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                   : ^    ^^         ^^^^^               
 >node : ParseNode
 >     : ^^^^^^^^^
 
@@ -1805,7 +1805,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForSemicolon(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForSemicolon : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                      : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -1941,7 +1941,7 @@ module Formatting {
 
         private GetSpecialCaseIndentationForComment(token: TokenSpan, node: ParseNode): IndentationInfo {
 >GetSpecialCaseIndentationForComment : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                    : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                    : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2058,11 +2058,11 @@ module Formatting {
 >this.CanIndentComment(token, node) : boolean
 >                                   : ^^^^^^^
 >this.CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                      : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                      : ^     ^^         ^^    ^^         ^^^^^       
 >this : this
 >     : ^^^^
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                 : ^     ^^         ^^    ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2093,11 +2093,11 @@ module Formatting {
 >this.ApplyIndentationDeltaFromParent(token, node) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                     : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                     : ^     ^^         ^^    ^^         ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2112,7 +2112,7 @@ module Formatting {
 
         private CanIndentComment(token: TokenSpan, node: ParseNode): boolean {
 >CanIndentComment : (token: TokenSpan, node: ParseNode) => boolean
->                 : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^       
+>                 : ^     ^^         ^^    ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -2339,7 +2339,7 @@ module Formatting {
 
         private ApplyScriptBlockIndentation(languageHostIndentation: string, tree: ParseTree): void
 >ApplyScriptBlockIndentation : (languageHostIndentation: string, tree: ParseTree) => void
->                            : ^                       ^^      ^^    ^^^^^^^^^^^^^^^^    
+>                            : ^                       ^^      ^^    ^^         ^^^^^    
 >languageHostIndentation : string
 >                        : ^^^^^^
 >tree : ParseTree
@@ -2441,7 +2441,7 @@ module Formatting {
 
         private GetIndentEdit(indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean): TextEditInfo {
 >GetIndentEdit : (indentInfo: IndentationInfo, tokenStartPosition: number, sameLineIndent: boolean) => TextEditInfo
->              : ^          ^^^^^^^^^^^^^^^^^^^                  ^^      ^^              ^^       ^^^^^^^^^^^^^^^^^
+>              : ^          ^^               ^^                  ^^      ^^              ^^       ^^^^^            
 >indentInfo : IndentationInfo
 >           : ^^^^^^^^^^^^^^^
 >tokenStartPosition : number
@@ -3005,7 +3005,7 @@ module Formatting {
 
         private  ApplyIndentationDeltaFromParent(token: TokenSpan, node: ParseNode): IndentationInfo {
 >ApplyIndentationDeltaFromParent : (token: TokenSpan, node: ParseNode) => IndentationInfo
->                                : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                                : ^     ^^         ^^    ^^         ^^^^^               
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -3135,11 +3135,11 @@ module Formatting {
 >this.ApplyIndentationDelta1(token.Span.startPosition(), parentIndentationDeltaSize) : IndentationInfo
 >                                                                                    : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                            : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^                  ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^                  ^^      ^^     ^^      ^^^^^               
 >token.Span.startPosition() : any
 >                           : ^^^
 >token.Span.startPosition : any
@@ -3164,7 +3164,7 @@ module Formatting {
 
         private ApplyIndentationDelta1(tokenStartPosition: number, delta: number): IndentationInfo {
 >ApplyIndentationDelta1 : (tokenStartPosition: number, delta: number) => IndentationInfo
->                       : ^                  ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^                  ^^      ^^     ^^      ^^^^^               
 >tokenStartPosition : number
 >                   : ^^^^^^
 >delta : number
@@ -3240,11 +3240,11 @@ module Formatting {
 >this.ApplyIndentationDelta2(currentIndent, delta) : IndentationInfo
 >                                                  : ^^^^^^^^^^^^^^^
 >this.ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                            : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                            : ^             ^^      ^^     ^^      ^^^^^               
 >this : this
 >     : ^^^^
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >currentIndent : any
 >              : ^^^
 >delta : number
@@ -3253,7 +3253,7 @@ module Formatting {
 
         private ApplyIndentationDelta2(currentIndent: string, delta: number): IndentationInfo {
 >ApplyIndentationDelta2 : (currentIndent: string, delta: number) => IndentationInfo
->                       : ^             ^^      ^^     ^^      ^^^^^^^^^^^^^^^^^^^^
+>                       : ^             ^^      ^^     ^^      ^^^^^               
 >currentIndent : string
 >              : ^^^^^^
 >delta : number
@@ -3275,11 +3275,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(currentIndent, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >currentIndent : string
 >              : ^^^^^^
 >this.editorOptions : Services.EditorOptions
@@ -3499,11 +3499,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromText(origIndentText, this.editorOptions, /*includeNonIndentChars*/true) : number
 >                                                                                                  : ^^^^^^
 >Indenter.GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                               : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                               : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromText : (text: string, editorOptions: Services.EditorOptions, includeNonIndentChars: boolean) => number
->                      : ^    ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^                     ^^       ^^^^^      
+>                      : ^    ^^      ^^             ^^                      ^^                     ^^       ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3521,11 +3521,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(newIndentText, this.editorOptions) : number
 >                                                                        : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >newIndentText : any
 >              : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3613,11 +3613,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(childIndentText, this.editorOptions) : number
 >                                                                          : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >childIndentText : any
 >                : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3643,11 +3643,11 @@ module Formatting {
 >Indenter.GetIndentSizeFromIndentText(origIndentText, this.editorOptions) : number
 >                                                                         : ^^^^^^
 >Indenter.GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                                     : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                                     : ^          ^^      ^^             ^^                      ^^^^^      
 >Indenter : typeof Indenter
 >         : ^^^^^^^^^^^^^^^
 >GetIndentSizeFromIndentText : (indentText: string, editorOptions: Services.EditorOptions) => number
->                            : ^          ^^      ^^             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      
+>                            : ^          ^^      ^^             ^^                      ^^^^^      
 >origIndentText : any
 >               : ^^^
 >this.editorOptions : Services.EditorOptions
@@ -3696,7 +3696,7 @@ module Formatting {
 
         private FillInheritedIndentation(tree: ParseTree): void
 >FillInheritedIndentation : (tree: ParseTree) => void
->                         : ^    ^^^^^^^^^^^^^^^^    
+>                         : ^    ^^         ^^^^^    
 >tree : ParseTree
 >     : ^^^^^^^^^
         {
@@ -4642,7 +4642,7 @@ module Formatting {
 
         private RegisterIndentation(indent: TextEditInfo, sameLineIndent: boolean): void
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >indent : TextEditInfo
 >       : ^^^^^^^^^^^^
 >sameLineIndent : boolean
@@ -4772,11 +4772,11 @@ module Formatting {
 >this.RegisterIndentation(new TextEditInfo(position, 0, indent), false) : void
 >                                                                       : ^^^^
 >this.RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                         : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                         : ^      ^^            ^^              ^^       ^^^^^    
 >this : this
 >     : ^^^^
 >RegisterIndentation : (indent: TextEditInfo, sameLineIndent: boolean) => void
->                    : ^      ^^^^^^^^^^^^^^^^              ^^       ^^^^^    
+>                    : ^      ^^            ^^              ^^       ^^^^^    
 >new TextEditInfo(position, 0, indent) : any
 >                                      : ^^^
 >TextEditInfo : any
@@ -4793,7 +4793,7 @@ module Formatting {
 
         private AdjustStartOffsetIfNeeded(token: TokenSpan, node: ParseNode): void
 >AdjustStartOffsetIfNeeded : (token: TokenSpan, node: ParseNode) => void
->                          : ^     ^^^^^^^^^^^^^    ^^^^^^^^^^^^^^^^    
+>                          : ^     ^^         ^^    ^^         ^^^^^    
 >token : TokenSpan
 >      : ^^^^^^^^^
 >node : ParseNode
@@ -4982,7 +4982,7 @@ module Formatting {
 
         private IsMultiLineString(token: TokenSpan): boolean {
 >IsMultiLineString : (token: TokenSpan) => boolean
->                  : ^     ^^^^^^^^^^^^^^^^       
+>                  : ^     ^^         ^^^^^       
 >token : TokenSpan
 >      : ^^^^^^^^^
 
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index 6e2f15b99bac9..b7365ddb1c871 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -1542,7 +1542,7 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_public : new () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                            : ^^^^^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1552,13 +1552,13 @@ export declare module "use_glo_M1_public" {
 
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_public : () => use_glo_M2_public.c1
->                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                            : ^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
 >use_glo_M2_public_v1_private : new () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1568,7 +1568,7 @@ export declare module "use_glo_M1_public" {
 
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 >use_glo_M2_public_v3_private : () => use_glo_M2_public.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^                    
 >use_glo_M2_public : any
 >                  : ^^^
 
@@ -1646,7 +1646,7 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_public : new () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1656,13 +1656,13 @@ declare module "use_glo_M3_private" {
 
     export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_public : () => use_glo_M4_private.c1
->                             : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                             : ^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
     var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
 >use_glo_M4_private_v1_private : new () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
@@ -1672,7 +1672,7 @@ declare module "use_glo_M3_private" {
 
     var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 >use_glo_M4_private_v3_private : () => use_glo_M4_private.c1
->                              : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>                              : ^^^^^^                     
 >use_glo_M4_private : any
 >                   : ^^^
 
diff --git a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
index ff9599ec47844..7bc83bc1f9987 100644
--- a/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
+++ b/tests/baselines/reference/prototypePropertyAssignmentMergeWithInterfaceMethod.types
@@ -6,7 +6,7 @@ declare namespace lf {
   export interface Transaction {
     attach(query: query.Builder): Promise<Array<Object>>
 >attach : (query: query.Builder) => Promise<Array<Object>>
->       : ^     ^^^^^^^^^^^^^^^^^^^^                      
+>       : ^     ^^             ^^^^^                      
 >query : query.Builder
 >      : ^^^^^^^^^^^^^
 >query : any
@@ -38,7 +38,7 @@ declare namespace lf {
 
     stats(): TransactionStats
 >stats : () => TransactionStats
->      : ^^^^^^^^^^^^^^^^^^^^^^
+>      : ^^^^^^                
   }
 }
 === lovefield.js ===
@@ -60,7 +60,7 @@ lf.Transaction = function() {};
  */
 lf.Transaction.prototype.begin = function(scope) {};
 >lf.Transaction.prototype.begin = function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                                                    : ^     ^^                      ^^^^^^^^^^^^^^
+>                                                    : ^     ^^                      ^^^^^         
 >lf.Transaction.prototype.begin : any
 >                               : ^^^
 >lf.Transaction.prototype : any
@@ -76,7 +76,7 @@ lf.Transaction.prototype.begin = function(scope) {};
 >begin : any
 >      : ^^^
 >function(scope) {} : (scope: Array<lf.schema.Table>) => IThenable
->                   : ^     ^^                      ^^^^^^^^^^^^^^
+>                   : ^     ^^                      ^^^^^         
 >scope : lf.schema.Table[]
 >      : ^^^^^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/recursiveClassReferenceTest.types b/tests/baselines/reference/recursiveClassReferenceTest.types
index 7cb4b6c38b526..092de33da333b 100644
--- a/tests/baselines/reference/recursiveClassReferenceTest.types
+++ b/tests/baselines/reference/recursiveClassReferenceTest.types
@@ -34,7 +34,7 @@ declare module Sample.Thing {
   
   		getDomNode(): Element;
 >getDomNode : () => Element
->           : ^^^^^^^^^^^^^
+>           : ^^^^^^       
 		
 		addWidget(widgetId:string, widget:IWidget);
 >addWidget : (widgetId: string, widget: IWidget) => any
diff --git a/tests/baselines/reference/recursiveMappedTypes.types b/tests/baselines/reference/recursiveMappedTypes.types
index b9724d792d72b..650478677ba83 100644
--- a/tests/baselines/reference/recursiveMappedTypes.types
+++ b/tests/baselines/reference/recursiveMappedTypes.types
@@ -35,8 +35,8 @@ type tup = [number, number, number, number];
 >    : ^^^
 
 function foo(arg: Circular<tup>): tup {
->foo : (arg: any) => tup
->    : ^   ^^^^^^^^^^   
+>foo : (arg: Circular<tup>) => tup
+>    : ^   ^^             ^^^^^   
 >arg : any
 >    : ^^^
 
diff --git a/tests/baselines/reference/recursiveTypeComparison2.types b/tests/baselines/reference/recursiveTypeComparison2.types
index 86b2b2a76f206..9f8d4d2de2a60 100644
--- a/tests/baselines/reference/recursiveTypeComparison2.types
+++ b/tests/baselines/reference/recursiveTypeComparison2.types
@@ -54,7 +54,7 @@ declare module Bacon {
 >initState : U
 >          : ^
 >f : (state: U, event: Event<T>) => StateValue<U, V>
->  : ^     ^^ ^^     ^^        ^^^^^^^^^^^^^^^^^^^^^
+>  : ^     ^^ ^^     ^^        ^^^^^                
 >state : U
 >      : ^
 >event : Event<T>
diff --git a/tests/baselines/reference/recursiveTypeRelations.types b/tests/baselines/reference/recursiveTypeRelations.types
index ea8075748f21c..14fc3c854d501 100644
--- a/tests/baselines/reference/recursiveTypeRelations.types
+++ b/tests/baselines/reference/recursiveTypeRelations.types
@@ -117,7 +117,7 @@ export function css<S extends { [K in keyof S]: string }>(styles: S, ...classNam
 >reduce : { (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string): string; (callbackfn: (previousValue: string, currentValue: string, currentIndex: number, array: string[]) => string, initialValue: string): string; <U>(callbackfn: (previousValue: U, currentValue: string, currentIndex: number, array: string[]) => U, initialValue: U): U; }
 >       : ^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^             ^^^^^^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^^^^^^^^^^^ ^^          ^^^             ^^^^^            ^^^^^^^^^^            ^^      ^^     ^^^^^^^^^^^^^^^^^^            ^^^^^^^^^^
 >(obj: ClassNameObject, key: keyof S) => {        const exportedClassName = styles[key];        obj[exportedClassName] = (arg as ClassNameMap<S>)[key];         return obj;      } : (obj: ClassNameObject, key: keyof S) => ClassNameObject
->                                                                                                                                                                                  : ^   ^^^^^^^^^^^^^^^^^^^   ^^       ^^^^^^^^^^^^^^^^^^^^
+>                                                                                                                                                                                  : ^   ^^               ^^   ^^       ^^^^^^^^^^^^^^^^^^^^
 >obj : ClassNameObject
 >    : ^^^^^^^^^^^^^^^
 >key : keyof S
diff --git a/tests/baselines/reference/returnTypeTypeArguments.types b/tests/baselines/reference/returnTypeTypeArguments.types
index f56cf51e130ee..6610909f4dfd1 100644
--- a/tests/baselines/reference/returnTypeTypeArguments.types
+++ b/tests/baselines/reference/returnTypeTypeArguments.types
@@ -39,56 +39,56 @@ class Three<T, U, V>{
 }
 
 function A1(): One { return null; }
->A1 : () => any
->   : ^^^^^^^^^
+>A1 : () => One
+>   : ^^^^^^   
 
 function A2(): Two { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two
+>   : ^^^^^^   
 
 function A3(): Three { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three
+>   : ^^^^^^     
 
 function B1(): Two<number> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<number>
+>   : ^^^^^^           
 
 function B2(): Three<string> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<string>
+>   : ^^^^^^             
 
 function B3(): Three<string, number> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, number>
+>   : ^^^^^^                     
 
 class C {
 >C : C
 >  : ^
 
     A1(): One { return null; }
->A1 : () => any
->   : ^^^^^^^^^
+>A1 : () => One
+>   : ^^^^^^   
 
     A2(): Two { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two
+>   : ^^^^^^   
 
     A3(): Three { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three
+>   : ^^^^^^     
 
     B1(): Two<number> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<number>
+>   : ^^^^^^           
 
     B2(): Three<string> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<string>
+>   : ^^^^^^             
 
     B3(): Three<string, number> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, number>
+>   : ^^^^^^                     
 }
 
 class D<T> {
@@ -96,24 +96,24 @@ class D<T> {
 >  : ^^^^
 
     A2(): Two<T> { return null; }
->A2 : () => any
->   : ^^^^^^^^^
+>A2 : () => Two<T>
+>   : ^^^^^^      
 
     A3(): Three<T> { return null; }
->A3 : () => any
->   : ^^^^^^^^^
+>A3 : () => Three<T>
+>   : ^^^^^^        
 
     B1(): Two<T> { return null; }
->B1 : () => any
->   : ^^^^^^^^^
+>B1 : () => Two<T>
+>   : ^^^^^^      
 
     B2(): Three<T> { return null; }
->B2 : () => any
->   : ^^^^^^^^^
+>B2 : () => Three<T>
+>   : ^^^^^^        
 
     B3(): Three<string, T> { return null; }
->B3 : () => any
->   : ^^^^^^^^^
+>B3 : () => Three<string, T>
+>   : ^^^^^^                
 }
 
 interface I<T> {
@@ -136,8 +136,8 @@ class X<T>
 >  : ^^^^
 {
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -158,8 +158,8 @@ class X<T>
 >   : ^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
@@ -181,12 +181,12 @@ class X<T>
 }
 
 declare var a: {
->a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: any; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: any; }
->  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^^^^^^^
+>a : { p1: () => X; p2: { [idx: number]: X; }; p3: X[]; p4: I<X>; p5: X; p6: () => Y; p7: { [idx: number]: Y; }; p8: Y[]; p9: I<Y>; pa: Y; }
+>  : ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^^^^       ^^^^^^                     ^^^^^^   ^^^^^^    ^^^^^^ ^^^
 
     p1: () => X;
->p1 : () => any
->   : ^^^^^^^^^
+>p1 : () => X
+>   : ^^^^^^ 
 
     p2: { [idx: number]: X }
 >p2 : { [idx: number]: any; }
@@ -207,8 +207,8 @@ declare var a: {
 >   : ^^^
 
     p6: () => Y;
->p6 : () => any
->   : ^^^^^^^^^
+>p6 : () => Y
+>   : ^^^^^^ 
 
     p7: { [idx: number]: Y }
 >p7 : { [idx: number]: any; }
diff --git a/tests/baselines/reference/sourceMapSample.types b/tests/baselines/reference/sourceMapSample.types
index d4b647d19d444..18833168898e4 100644
--- a/tests/baselines/reference/sourceMapSample.types
+++ b/tests/baselines/reference/sourceMapSample.types
@@ -45,7 +45,7 @@ module Foo.Bar {
 
     function foo(greeting: string): Foo.Bar.Greeter {
 >foo : (greeting: string) => Foo.Bar.Greeter
->    : ^        ^^      ^^^^^^^^^^^^^^^^^^^^
+>    : ^        ^^      ^^^^^               
 >greeting : string
 >         : ^^^^^^
 >Foo : any
diff --git a/tests/baselines/reference/staticInstanceResolution5.types b/tests/baselines/reference/staticInstanceResolution5.types
index 157f53f468e87..b61028cde79de 100644
--- a/tests/baselines/reference/staticInstanceResolution5.types
+++ b/tests/baselines/reference/staticInstanceResolution5.types
@@ -8,23 +8,23 @@ import WinJS = require('staticInstanceResolution5_0');
 // these 3 should be errors
 var x = (w1: WinJS) => { };
 >x : (w1: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >(w1: WinJS) => { } : (w1: WinJS) => void
->                   : ^  ^^^^^^^^^^^^^^^^
+>                   : ^  ^^     ^^^^^^^^^
 >w1 : WinJS
 >   : ^^^^^
 
 var y = function (w2: WinJS) { }
 >y : (w2: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >function (w2: WinJS) { } : (w2: WinJS) => void
->                         : ^  ^^^^^^^^^^^^^^^^
+>                         : ^  ^^     ^^^^^^^^^
 >w2 : WinJS
 >   : ^^^^^
 
 function z(w3: WinJS) { }
 >z : (w3: WinJS) => void
->  : ^  ^^^^^^^^^^^^^^^^
+>  : ^  ^^     ^^^^^^^^^
 >w3 : WinJS
 >   : ^^^^^
 
diff --git a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
index 2c0cdd3fb0024..296bd6f3ed763 100644
--- a/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
+++ b/tests/baselines/reference/staticMembersUsingClassTypeParameter.types
@@ -12,7 +12,7 @@ class C<T> {
 
     static f(x: T) {}
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
@@ -27,7 +27,7 @@ class C2<T, U> {
 
     static f(x: U) { }
 >f : (x: U) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : U
 >  : ^
 }
@@ -42,7 +42,7 @@ class C3<T extends Date> {
 
     static f(x: T) { }
 >f : (x: T) => void
->  : ^ ^^^^^^^^^^^^
+>  : ^ ^^ ^^^^^^^^^
 >x : T
 >  : ^
 }
diff --git a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
index 5de409da74475..4faf575220e70 100644
--- a/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
+++ b/tests/baselines/reference/staticMethodsReferencingClassTypeParameters.types
@@ -7,7 +7,7 @@ class C<T> {
 
     static s(p: T) { return p; }
 >s : (p: T) => T
->  : ^ ^^^^^^^^^
+>  : ^ ^^ ^^^^^^
 >p : T
 >  : ^
 >p : T
diff --git a/tests/baselines/reference/strictModeReservedWord.types b/tests/baselines/reference/strictModeReservedWord.types
index 9af014859e0cb..abffd78a7f044 100644
--- a/tests/baselines/reference/strictModeReservedWord.types
+++ b/tests/baselines/reference/strictModeReservedWord.types
@@ -101,7 +101,7 @@ function foo() {
 
     function foo(x: private.x) { }
 >foo : (x: private.x) => void
->    : ^ ^^^^^^^^^^^^^^^^^^^^
+>    : ^ ^^         ^^^^^^^^^
 >x : private.x
 >  : ^^^^^^^^^
 >private : any
@@ -109,7 +109,7 @@ function foo() {
 
     function foo1(x: private.package.x) { }
 >foo1 : (x: private.package.x) => void
->     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^ ^^                 ^^^^^^^^^
 >x : private.package.x
 >  : ^^^^^^^^^^^^^^^^^
 >private : any
@@ -119,7 +119,7 @@ function foo() {
 
     function foo2(x: private.package.protected) { }
 >foo2 : (x: private.package.protected) => void
->     : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>     : ^ ^^                         ^^^^^^^^^
 >x : private.package.protected
 >  : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >private : any
diff --git a/tests/baselines/reference/thisTypeErrors.types b/tests/baselines/reference/thisTypeErrors.types
index a336a9aa6e191..47ecf4c09ddd2 100644
--- a/tests/baselines/reference/thisTypeErrors.types
+++ b/tests/baselines/reference/thisTypeErrors.types
@@ -6,8 +6,8 @@ var x1: this;
 >   : ^^^
 
 var x2: { a: this };
->x2 : { a: any; }
->   : ^^^^^^^^^^^
+>x2 : { a: this; }
+>   : ^^^^^    ^^^
 >a : any
 >  : ^^^
 
@@ -16,8 +16,8 @@ var x3: this[];
 >   : ^^^^^
 
 function f1(x: this): this {
->f1 : (x: any) => any
->   : ^ ^^^^^^^^^^^^^
+>f1 : (x: this) => this
+>   : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -32,18 +32,18 @@ function f1(x: this): this {
 
 interface I1 {
     a: { x: this };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: this; }
+>  : ^^^^^    ^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => any
->  : ^^^^^^^^^
+>b : () => this
+>  : ^^^^^^    
 
     c: { new (): this };
->c : new () => any
->  : ^^^^^^^^^^^^^
+>c : new () => this
+>  : ^^^^^^^^^^    
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -52,10 +52,10 @@ interface I1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: any): any; }
->  : ^^^^ ^^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>e : { f(x: this): this; }
+>  : ^^^^ ^^    ^^^    ^^^
+>f : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 }
@@ -65,18 +65,18 @@ class C1 {
 >   : ^^
 
     a: { x: this };
->a : { x: any; }
->  : ^^^^^^^^^^^
+>a : { x: this; }
+>  : ^^^^^    ^^^
 >x : any
 >  : ^^^
 
     b: { (): this };
->b : () => any
->  : ^^^^^^^^^
+>b : () => this
+>  : ^^^^^^    
 
     c: { new (): this };
->c : new () => any
->  : ^^^^^^^^^^^^^
+>c : new () => this
+>  : ^^^^^^^^^^    
 
     d: { [x: string]: this };
 >d : { [x: string]: any; }
@@ -85,10 +85,10 @@ class C1 {
 >  : ^^^^^^
 
     e: { f(x: this): this };
->e : { f(x: any): any; }
->  : ^^^^ ^^^^^^^^^^^^^^
->f : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>e : { f(x: this): this; }
+>  : ^^^^ ^^    ^^^    ^^^
+>f : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 }
@@ -110,8 +110,8 @@ class C2 {
 >          : ^^^^^^^^^
 
     static foo(x: this): this {
->foo : (x: any) => any
->    : ^ ^^^^^^^^^^^^^
+>foo : (x: this) => this
+>    : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -141,14 +141,14 @@ class C3 {
 >   : ^^
 
     x1 = {
->x1 : { g(x: any): any; }
->   : ^^^^ ^^^^^^^^^^^^^^
->{        g(x: this): this {            return undefined;        }    } : { g(x: any): any; }
->                                                                       : ^^^^ ^^^^^^^^^^^^^^
+>x1 : { g(x: this): this; }
+>   : ^^^^ ^^    ^^^    ^^^
+>{        g(x: this): this {            return undefined;        }    } : { g(x: this): this; }
+>                                                                       : ^^^^ ^^    ^^^    ^^^
 
         g(x: this): this {
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -162,8 +162,8 @@ class C3 {
 >  : ^^^^^^^^^^
 
         function g(x: this): this {
->g : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>g : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
@@ -172,14 +172,14 @@ class C3 {
 >          : ^^^^^^^^^
         }
         let x2 = {
->x2 : { h(x: any): any; }
->   : ^^^^ ^^^^^^^^^^^^^^
->{            h(x: this): this {                return undefined;            }        } : { h(x: any): any; }
->                                                                                       : ^^^^ ^^^^^^^^^^^^^^
+>x2 : { h(x: this): this; }
+>   : ^^^^ ^^    ^^^    ^^^
+>{            h(x: this): this {                return undefined;            }        } : { h(x: this): this; }
+>                                                                                       : ^^^^ ^^    ^^^    ^^^
 
             h(x: this): this {
->h : (x: any) => any
->  : ^ ^^^^^^^^^^^^^
+>h : (x: this) => this
+>  : ^ ^^    ^^^^^    
 >x : any
 >  : ^^^
 
diff --git a/tests/baselines/reference/typeGuardFunctionErrors.types b/tests/baselines/reference/typeGuardFunctionErrors.types
index b493759532198..7fda3c139ac01 100644
--- a/tests/baselines/reference/typeGuardFunctionErrors.types
+++ b/tests/baselines/reference/typeGuardFunctionErrors.types
@@ -58,7 +58,7 @@ function hasTypeGuardTypeInsideTypeGuardType(x): x is x is A {
 
 function hasMissingIsKeyword(): x {
 >hasMissingIsKeyword : () => x
->                    : ^^^^^^^
+>                    : ^^^^^^ 
 
     return true;
 >true : true
@@ -330,7 +330,7 @@ var b1: b is A;
 
 function b2(a: b is A) {};
 >b2 : (a: b, is: any, A: any) => void
->   : ^ ^^^^^  ^^^^^^^ ^^^^^^^^^^^^^^
+>   : ^ ^^ ^^  ^^^^^^^ ^^^^^^^^^^^^^^
 >a : b
 >  : ^
 >is : any
@@ -339,8 +339,8 @@ function b2(a: b is A) {};
 >  : ^^^
 
 function b3(): A | b is A {
->b3 : () => any
->   : ^^^^^^^^^
+>b3 : () => A | b
+>   : ^^^^^^     
 >is : any
 >   : ^^^
 >A : typeof A
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
index 4b6de36790962..47f7c866ed0ee 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint4.types
@@ -50,7 +50,7 @@ interface I<T, U extends T, V extends U> {
 
 function foo<T, U extends T>(x: T, y: U): V { // error
 >foo : <T, U extends T>(x: T, y: U) => V
->    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^
+>    : ^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 >y : U
@@ -58,7 +58,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
     function bar<V extends T, W extends U>(): X { // error
 >bar : <V extends T, W extends U>() => X
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -85,7 +85,7 @@ function foo<T, U extends T>(x: T, y: U): V { // error
 
 function foo2<U extends T, T>(x: T, y: U): W { // error
 >foo2 : <U extends T, T>(x: T, y: U) => W
->     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^
+>     : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^ 
 >x : T
 >  : ^
 >y : U
@@ -93,7 +93,7 @@ function foo2<U extends T, T>(x: T, y: U): W { // error
 
     function bar<V extends T, W extends U>(): Y { // error
 >bar : <V extends T, W extends U>() => Y
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^^^^^^ 
 
         function baz<X extends W, Y extends V>(a: X, b: Y): T {
 >baz : <X extends W, Y extends V>(a: X, b: Y) => T
@@ -130,7 +130,7 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
     function bar<V extends T, W extends U>(r: X, s: Y) { // error
 >bar : <V extends T, W extends U>(r: X, s: Y) => void
->    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>    : ^ ^^^^^^^^^ ^^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 >r : X
 >  : ^
 >s : Y
@@ -163,9 +163,9 @@ var f3 = <T, U extends T>(x: T, y: U) => {
 
 var f4 = <U extends T, T>(x: V, y: X) => { // error
 >f4 : <U extends T, T>(x: V, y: X) => void
->   : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>   : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 ><U extends T, T>(x: V, y: X) => { // error    function bar<V extends T, W extends U>() {        var g = <X extends W, Y extends V>(a: X, b: Y): T => {            x = y;            return y;        }    }} : <U extends T, T>(x: V, y: X) => void
->                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^^^^ ^^^^^^^^^^^^
+>                                                                                                                                                                                                             : ^ ^^^^^^^^^ ^^ ^^ ^^ ^^ ^^ ^^^^^^^^^
 >x : V
 >  : ^
 >y : X
diff --git a/tests/baselines/reference/typeParametersInStaticAccessors.types b/tests/baselines/reference/typeParametersInStaticAccessors.types
index 24e855a13a0c1..77f3193522c9b 100644
--- a/tests/baselines/reference/typeParametersInStaticAccessors.types
+++ b/tests/baselines/reference/typeParametersInStaticAccessors.types
@@ -7,13 +7,13 @@ class foo<T> {
 
     static get Foo(): () => T { return null; }
 >Foo : () => T
->    : ^^^^^^^
+>    : ^^^^^^ 
 
     static set Bar(v: { v: T }) { }
 >Bar : { v: T; }
->    : ^^^^^^^^^
+>    : ^^^^^ ^^^
 >v : { v: T; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 >v : T
 >  : ^
 } 
diff --git a/tests/baselines/reference/typeParametersInStaticMethods.types b/tests/baselines/reference/typeParametersInStaticMethods.types
index 9319245303c8a..dcba9fc2668a2 100644
--- a/tests/baselines/reference/typeParametersInStaticMethods.types
+++ b/tests/baselines/reference/typeParametersInStaticMethods.types
@@ -9,11 +9,11 @@ class foo<T> {
 >M : (x: (x: T) => { x: { y: T; }; }) => void
 >  : ^ ^^                           ^^^^^^^^^
 >x : (x: T) => { x: { y: T; }; }
->  : ^ ^^^^^^^^                 
+>  : ^ ^^ ^^^^^                 
 >x : T
 >  : ^
 >x : { y: T; }
->  : ^^^^^^^^^
+>  : ^^^^^ ^^^
 >y : T
 >  : ^
     }
diff --git a/tests/baselines/reference/typedefTagTypeResolution.types b/tests/baselines/reference/typedefTagTypeResolution.types
index 9712bc5ef0ff8..c193bf7fa420b 100644
--- a/tests/baselines/reference/typedefTagTypeResolution.types
+++ b/tests/baselines/reference/typedefTagTypeResolution.types
@@ -9,8 +9,8 @@
  * @return {T}
  */
 function f(x) {
->f : <U>(x: U) => U
->  : ^ ^^ ^^ ^^^^^^
+>f : <U>(x: U) => T
+>  : ^ ^^ ^^ ^^^^^ 
 >x : U
 >  : ^
 
diff --git a/tests/baselines/reference/typeofInObjectLiteralType.types b/tests/baselines/reference/typeofInObjectLiteralType.types
index 5aa62c161c84c..0e5ca99fcb430 100644
--- a/tests/baselines/reference/typeofInObjectLiteralType.types
+++ b/tests/baselines/reference/typeofInObjectLiteralType.types
@@ -2,8 +2,8 @@
 
 === typeofInObjectLiteralType.ts ===
 var a: { b: number; c: typeof b }; // Should give error for attempting to use type query on b.
->a : { b: number; c: any; }
->  : ^^^^^      ^^^^^^^^^^^
+>a : { b: number; c: typeof b; }
+>  : ^^^^^      ^^^^^        ^^^
 >b : number
 >  : ^^^^^^
 >c : any
diff --git a/tests/baselines/reference/undeclaredModuleError.types b/tests/baselines/reference/undeclaredModuleError.types
index ce795bd32a875..da0d54d795717 100644
--- a/tests/baselines/reference/undeclaredModuleError.types
+++ b/tests/baselines/reference/undeclaredModuleError.types
@@ -11,7 +11,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >path : string
 >     : ^^^^^^
 >accept : (stat: fs.Stats, name: string) => boolean
->       : ^    ^^^^^^^^^^^^    ^^      ^^^^^       
+>       : ^    ^^        ^^    ^^      ^^^^^       
 >stat : fs.Stats
 >     : ^^^^^^^^
 >fs : any
@@ -23,7 +23,7 @@ function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean
 >error : Error
 >      : ^^^^^
 >results : { name: string; stat: fs.Stats; }[]
->        : ^^^^^^^^      ^^^^^^^^^^^^^^^^^^^^^
+>        : ^^^^^^^^      ^^^^^^^^        ^^^^^
 >name : string
 >     : ^^^^^^
 >stat : fs.Stats
diff --git a/tests/baselines/reference/undefinedTypeArgument2.types b/tests/baselines/reference/undefinedTypeArgument2.types
index ffa16ff343598..d1c1862c98357 100644
--- a/tests/baselines/reference/undefinedTypeArgument2.types
+++ b/tests/baselines/reference/undefinedTypeArgument2.types
@@ -19,7 +19,7 @@ interface Query<T> {
 >item : T
 >     : ^
 >resultSelector : (outer: T, inner: U) => R
->               : ^     ^^ ^^     ^^ ^^^^^^
+>               : ^     ^^ ^^     ^^ ^^^^^ 
 >outer : T
 >      : ^
 >inner : U
diff --git a/tests/baselines/reference/unknownSymbolInGenericReturnType.types b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
index a35d347932961..8ade76d37e201 100644
--- a/tests/baselines/reference/unknownSymbolInGenericReturnType.types
+++ b/tests/baselines/reference/unknownSymbolInGenericReturnType.types
@@ -11,7 +11,7 @@ class Linq {
 >values : T[]
 >       : ^^^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^^
+>     : ^ ^^ ^^^^^ 
 >v : T
 >  : ^
 
@@ -61,7 +61,7 @@ class Linq {
 >func(values[i]) : A
 >                : ^
 >func : (v: T) => A
->     : ^ ^^ ^^^^^^
+>     : ^ ^^ ^^^^^ 
 >values[i] : T
 >          : ^
 >values : T[]
diff --git a/tests/baselines/reference/unknownSymbols1.types b/tests/baselines/reference/unknownSymbols1.types
index d762a0d699509..4d2c58ee5ad39 100644
--- a/tests/baselines/reference/unknownSymbols1.types
+++ b/tests/baselines/reference/unknownSymbols1.types
@@ -13,7 +13,7 @@ var y: asdf;
 
 function foo(x: asdf, y: number): asdf { }
 >foo : (x: asdf, y: number) => asdf
->    : ^ ^^^^^^^^ ^^      ^^^^^^^^^
+>    : ^ ^^    ^^ ^^      ^^^^^    
 >x : asdf
 >  : ^^^^
 >y : number
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
index 1edc387f4bf10..764075a757be3 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter2.ts
@@ -18,7 +18,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: any);`,
+      insertText: `method(param: import("./doesntexist.js").Foo);`,
       filterText: "method",
       hasAction: undefined,
     },
diff --git a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
index 61396a635886b..072725ac2f745 100644
--- a/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
+++ b/tests/cases/fourslash/completionsClassMemberImportTypeNodeParameter4.ts
@@ -21,7 +21,7 @@ verify.completions({
   includes: [
     {
       name: "method",
-      insertText: `method(param: any);`,
+      insertText: `method(param: import("./doesntexist.js").Foo);`,
       filterText: "method",
       hasAction: undefined,
     },

From 66daac13c0d639ca70a4beb06fda623798f66d1f Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Wed, 7 Aug 2024 18:13:47 -0700
Subject: [PATCH 10/11] Add AllowUnresolveNames flag to all NoTruncation

---
 src/compiler/checker.ts                           |  2 +-
 src/services/codefixes/fixAddMissingMember.ts     |  4 ++--
 src/services/codefixes/fixAddMissingParam.ts      |  3 ++-
 src/services/codefixes/helpers.ts                 |  6 +++---
 src/services/refactors/extractSymbol.ts           | 15 +++++++++------
 src/services/refactors/inferFunctionReturnType.ts |  5 +++--
 src/services/utilities.ts                         |  3 ++-
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index eab4b7e8990df..6d500c301ef76 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5964,7 +5964,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
         const noTruncation = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation;
-        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None));
+        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None), noTruncation ? InternalNodeBuilderFlags.AllowUnresolvedNames : InternalNodeBuilderFlags.None);
         if (typeNode === undefined) return Debug.fail("should always get typenode");
         // The unresolved type gets a synthesized comment on `any` to hint to users that it's not a plain `any`.
         // Otherwise, we always strip comments out.
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 0f2141fd8d4c8..77bec1ed7f173 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -494,11 +494,11 @@ function getTypeNode(checker: TypeChecker, node: ClassLikeDeclaration | Interfac
         const binaryExpression = token.parent.parent as BinaryExpression;
         const otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
         const widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
-        typeNode = checker.typeToTypeNode(widenedType, node, NodeBuilderFlags.NoTruncation);
+        typeNode = checker.typeToTypeNode(widenedType, node, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames);
     }
     else {
         const contextualType = checker.getContextualType(token.parent as Expression);
-        typeNode = contextualType ? checker.typeToTypeNode(contextualType, /*enclosingDeclaration*/ undefined, NodeBuilderFlags.NoTruncation) : undefined;
+        typeNode = contextualType ? checker.typeToTypeNode(contextualType, /*enclosingDeclaration*/ undefined, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames) : undefined;
     }
     return typeNode || factory.createKeywordTypeNode(SyntaxKind.AnyKeyword);
 }
diff --git a/src/services/codefixes/fixAddMissingParam.ts b/src/services/codefixes/fixAddMissingParam.ts
index c5ac4f25b2b09..65c9cf861586e 100644
--- a/src/services/codefixes/fixAddMissingParam.ts
+++ b/src/services/codefixes/fixAddMissingParam.ts
@@ -26,6 +26,7 @@ import {
     getNameOfDeclaration,
     getSourceFileOfNode,
     getTokenAtPosition,
+    InternalNodeBuilderFlags,
     isAccessExpression,
     isCallExpression,
     isIdentifier,
@@ -221,7 +222,7 @@ function tryGetName(node: FunctionLikeDeclaration) {
 }
 
 function typeToTypeNode(checker: TypeChecker, type: Type, enclosingDeclaration: Node) {
-    return checker.typeToTypeNode(checker.getWidenedType(type), enclosingDeclaration, NodeBuilderFlags.NoTruncation)
+    return checker.typeToTypeNode(checker.getWidenedType(type), enclosingDeclaration, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames)
         ?? factory.createKeywordTypeNode(SyntaxKind.UnknownKeyword);
 }
 
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index a1b4a49cef7a9..f4a29c3751d12 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -223,7 +223,7 @@ export function addNewNodeForMemberSymbol(
         case SyntaxKind.PropertyDeclaration:
             let flags = NodeBuilderFlags.NoTruncation;
             flags |= quotePreference === QuotePreference.Single ? NodeBuilderFlags.UseSingleQuotesForStringLiteralType : 0;
-            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+            let typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, InternalNodeBuilderFlags.AllowUnresolvedNames, getNoopSymbolTrackerWithResolver(context));
             if (importAdder) {
                 const importableReference = tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
                 if (importableReference) {
@@ -507,7 +507,7 @@ export function createSignatureDeclarationFromCallExpression(
         contextNode,
         scriptTarget,
         NodeBuilderFlags.NoTruncation,
-        /*internalFlags*/ undefined,
+        InternalNodeBuilderFlags.AllowUnresolvedNames,
         tracker,
     );
 
@@ -797,7 +797,7 @@ function createMethodImplementingSignatures(
 function getReturnTypeFromSignatures(signatures: readonly Signature[], checker: TypeChecker, context: TypeConstructionContext, enclosingDeclaration: ClassLikeDeclaration): TypeNode | undefined {
     if (length(signatures)) {
         const type = checker.getUnionType(map(signatures, checker.getReturnTypeOfSignature));
-        return checker.typeToTypeNode(type, enclosingDeclaration, NodeBuilderFlags.NoTruncation, /*internalFlags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+        return checker.typeToTypeNode(type, enclosingDeclaration, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames, getNoopSymbolTrackerWithResolver(context));
     }
 }
 
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
index d5ebc4e3c040d..4093074b9575a 100644
--- a/src/services/refactors/extractSymbol.ts
+++ b/src/services/refactors/extractSymbol.ts
@@ -61,6 +61,7 @@ import {
     hasEffectiveModifier,
     hasSyntacticModifier,
     Identifier,
+    InternalNodeBuilderFlags,
     isArray,
     isArrowFunction,
     isAssignmentExpression,
@@ -1062,7 +1063,7 @@ function extractFunctionInScope(
             let type = checker.getTypeOfSymbolAtLocation(usage.symbol, usage.node);
             // Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"
             type = checker.getBaseTypeOfLiteralType(type);
-            typeNode = codefix.typeToAutoImportableTypeNode(checker, importAdder, type, scope, scriptTarget, NodeBuilderFlags.NoTruncation);
+            typeNode = codefix.typeToAutoImportableTypeNode(checker, importAdder, type, scope, scriptTarget, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames);
         }
 
         const paramDecl = factory.createParameterDeclaration(
@@ -1096,7 +1097,7 @@ function extractFunctionInScope(
     // to avoid problems when there are literal types present
     if (isExpression(node) && !isJS) {
         const contextualType = checker.getContextualType(node);
-        returnType = checker.typeToTypeNode(contextualType!, scope, NodeBuilderFlags.NoTruncation); // TODO: GH#18217
+        returnType = checker.typeToTypeNode(contextualType!, scope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames); // TODO: GH#18217
     }
 
     const { body, returnValueProperty } = transformFunctionBody(node, exposedVariableDeclarations, writes, substitutions, !!(range.facts & RangeFacts.HasReturn));
@@ -1138,6 +1139,7 @@ function extractFunctionInScope(
                         checker.getTypeAtLocation(range.thisNode!),
                         scope,
                         NodeBuilderFlags.NoTruncation,
+                        InternalNodeBuilderFlags.AllowUnresolvedNames,
                     ),
                     /*initializer*/ undefined,
                 ),
@@ -1228,6 +1230,7 @@ function extractFunctionInScope(
                     checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(variableDeclaration)),
                     scope,
                     NodeBuilderFlags.NoTruncation,
+                    InternalNodeBuilderFlags.AllowUnresolvedNames,
                 );
 
                 typeElements.push(factory.createPropertySignature(
@@ -1378,7 +1381,7 @@ function extractConstantInScope(
 
     let variableType = isJS || !checker.isContextSensitive(node)
         ? undefined
-        : checker.typeToTypeNode(checker.getContextualType(node)!, scope, NodeBuilderFlags.NoTruncation); // TODO: GH#18217
+        : checker.typeToTypeNode(checker.getContextualType(node)!, scope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames); // TODO: GH#18217
 
     let initializer = transformConstantInitializer(skipParentheses(node), substitutions);
 
@@ -1512,7 +1515,7 @@ function extractConstantInScope(
                 const paramType = checker.getTypeAtLocation(p);
                 if (paramType === checker.getAnyType()) hasAny = true;
 
-                parameters.push(factory.updateParameterDeclaration(p, p.modifiers, p.dotDotDotToken, p.name, p.questionToken, p.type || checker.typeToTypeNode(paramType, scope, NodeBuilderFlags.NoTruncation), p.initializer));
+                parameters.push(factory.updateParameterDeclaration(p, p.modifiers, p.dotDotDotToken, p.name, p.questionToken, p.type || checker.typeToTypeNode(paramType, scope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames), p.initializer));
             }
         }
         // If a parameter was inferred as any we skip adding function parameters at all.
@@ -1521,7 +1524,7 @@ function extractConstantInScope(
         if (hasAny) return { variableType, initializer };
         variableType = undefined;
         if (isArrowFunction(initializer)) {
-            initializer = factory.updateArrowFunction(initializer, canHaveModifiers(node) ? getModifiers(node) : undefined, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, NodeBuilderFlags.NoTruncation), initializer.equalsGreaterThanToken, initializer.body);
+            initializer = factory.updateArrowFunction(initializer, canHaveModifiers(node) ? getModifiers(node) : undefined, initializer.typeParameters, parameters, initializer.type || checker.typeToTypeNode(functionSignature.getReturnType(), scope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames), initializer.equalsGreaterThanToken, initializer.body);
         }
         else {
             if (functionSignature && !!functionSignature.thisParameter) {
@@ -1538,7 +1541,7 @@ function extractConstantInScope(
                             /*dotDotDotToken*/ undefined,
                             "this",
                             /*questionToken*/ undefined,
-                            checker.typeToTypeNode(thisType, scope, NodeBuilderFlags.NoTruncation),
+                            checker.typeToTypeNode(thisType, scope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames),
                         ),
                     );
                 }
diff --git a/src/services/refactors/inferFunctionReturnType.ts b/src/services/refactors/inferFunctionReturnType.ts
index 42607e3888bda..d147fbbed19b9 100644
--- a/src/services/refactors/inferFunctionReturnType.ts
+++ b/src/services/refactors/inferFunctionReturnType.ts
@@ -11,6 +11,7 @@ import {
     FunctionExpression,
     getLocaleSpecificMessage,
     getTouchingPropertyName,
+    InternalNodeBuilderFlags,
     isArrowFunction,
     isBlock,
     isInJSFile,
@@ -126,7 +127,7 @@ function getInfo(context: RefactorContext): FunctionInfo | RefactorErrorInfo | u
         if (signature) {
             const typePredicate = typeChecker.getTypePredicateOfSignature(signature);
             if (typePredicate && typePredicate.type) {
-                const typePredicateTypeNode = typeChecker.typePredicateToTypePredicateNode(typePredicate, declaration, NodeBuilderFlags.NoTruncation);
+                const typePredicateTypeNode = typeChecker.typePredicateToTypePredicateNode(typePredicate, declaration, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames);
                 if (typePredicateTypeNode) {
                     return { declaration, returnTypeNode: typePredicateTypeNode };
                 }
@@ -141,7 +142,7 @@ function getInfo(context: RefactorContext): FunctionInfo | RefactorErrorInfo | u
         return { error: getLocaleSpecificMessage(Diagnostics.Could_not_determine_function_return_type) };
     }
 
-    const returnTypeNode = typeChecker.typeToTypeNode(returnType, declaration, NodeBuilderFlags.NoTruncation);
+    const returnTypeNode = typeChecker.typeToTypeNode(returnType, declaration, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames);
     if (returnTypeNode) {
         return { declaration, returnTypeNode };
     }
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 599d2a8018083..c3908e208b74f 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -132,6 +132,7 @@ import {
     ImportTypeNode,
     indexOfNode,
     IndexSignatureDeclaration,
+    InternalNodeBuilderFlags,
     InternalSymbolName,
     isAmbientModule,
     isAnyImportSyntax,
@@ -3440,7 +3441,7 @@ export function getTypeNodeIfAccessible(type: Type, enclosingScope: Node, progra
     const checker = program.getTypeChecker();
     let typeIsAccessible = true;
     const notAccessible = () => typeIsAccessible = false;
-    const res = checker.typeToTypeNode(type, enclosingScope, NodeBuilderFlags.NoTruncation, /*internalFlags*/ undefined, {
+    const res = checker.typeToTypeNode(type, enclosingScope, NodeBuilderFlags.NoTruncation, InternalNodeBuilderFlags.AllowUnresolvedNames, {
         trackSymbol: (symbol, declaration, meaning) => {
             typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === SymbolAccessibility.Accessible;
             return !typeIsAccessible;

From 330c65b38a7e2c22eba28d5cdd371ab01ed778b1 Mon Sep 17 00:00:00 2001
From: Armando Aguirre Sepulveda <araguir@microsoft.com>
Date: Wed, 7 Aug 2024 18:53:53 -0700
Subject: [PATCH 11/11] Rollback TypeFormatFlags.NoTruncation

---
 src/compiler/checker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 6d500c301ef76..b32f9fe61d89e 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -5964,7 +5964,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
         const noTruncation = compilerOptions.noErrorTruncation || flags & TypeFormatFlags.NoTruncation;
-        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None), noTruncation ? InternalNodeBuilderFlags.AllowUnresolvedNames : InternalNodeBuilderFlags.None);
+        const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors | (noTruncation ? NodeBuilderFlags.NoTruncation : NodeBuilderFlags.None), /*internalFlags*/ undefined);
         if (typeNode === undefined) return Debug.fail("should always get typenode");
         // The unresolved type gets a synthesized comment on `any` to hint to users that it's not a plain `any`.
         // Otherwise, we always strip comments out.