diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 069f2a15bba..91162998555 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -896,37 +896,27 @@ module ts {
         languageVersion: ScriptTarget;
         identifiers: Map<string>;
         
-        // @internal
-        nodeCount: number;
+        /* @internal */ nodeCount: number;
+        /* @internal */ identifierCount: number;
+        /* @internal */ symbolCount: number;
 
-        // @internal
-        identifierCount: number;
-
-        // @internal
-        symbolCount: number;
-
-        // @internal
         // Diagnostics reported about the "///<reference" comments in the file.
-        referenceDiagnostics: Diagnostic[];
+        /* @internal */ referenceDiagnostics: Diagnostic[];
         
-        // @internal
         // Parse errors refer specifically to things the parser could not understand at all (like 
         // missing tokens, or tokens it didn't know how to deal with).
-        parseDiagnostics: Diagnostic[];
+        /* @internal */ parseDiagnostics: Diagnostic[];
         
-        // @internal
         // File level diagnostics reported by the binder.
-        semanticDiagnostics: Diagnostic[];
+        /* @internal */ semanticDiagnostics: Diagnostic[];
         
-        // @internal
         // Returns all syntactic diagnostics (i.e. the reference, parser and grammar diagnostics).
         // This field should never be used directly, use getSyntacticDiagnostics function instead.
-        syntacticDiagnostics: Diagnostic[];
+        /* @internal */ syntacticDiagnostics: Diagnostic[];
 
-        // @internal
         // Stores a line map for the file.
         // This field should never be used directly to obtain line map, use getLineMap function instead.
-        lineMap: number[];
+        /* @internal */ lineMap: number[];
     }
 
     export interface ScriptReferenceHost {
@@ -1007,10 +997,6 @@ module ts {
         getEmitResolver(): EmitResolver;
         getDiagnostics(sourceFile?: SourceFile): Diagnostic[];
         getGlobalDiagnostics(): Diagnostic[];
-        getNodeCount(): number;
-        getIdentifierCount(): number;
-        getSymbolCount(): number;
-        getTypeCount(): number;
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
@@ -1039,6 +1025,11 @@ module ts {
         getEnumMemberValue(node: EnumMember): number;
         isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean;
         getAliasedSymbol(symbol: Symbol): Symbol;
+
+        /* @internal */ getNodeCount(): number;
+        /* @internal */ getIdentifierCount(): number;
+        /* @internal */ getSymbolCount(): number;
+        /* @internal */ getTypeCount(): number;
     }
 
     export interface SymbolDisplayBuilder {
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 7fc7622ea17..4131e78284d 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -791,10 +791,6 @@ declare module "typescript" {
         getEmitResolver(): EmitResolver;
         getDiagnostics(sourceFile?: SourceFile): Diagnostic[];
         getGlobalDiagnostics(): Diagnostic[];
-        getNodeCount(): number;
-        getIdentifierCount(): number;
-        getSymbolCount(): number;
-        getTypeCount(): number;
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index 2859c021a37..2b887bd94ab 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -2421,18 +2421,6 @@ declare module "typescript" {
 >getGlobalDiagnostics : () => Diagnostic[]
 >Diagnostic : Diagnostic
 
-        getNodeCount(): number;

->getNodeCount : () => number
-
-        getIdentifierCount(): number;

->getIdentifierCount : () => number
-
-        getSymbolCount(): number;

->getSymbolCount : () => number
-
-        getTypeCount(): number;

->getTypeCount : () => number
-
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;

 >getTypeOfSymbolAtLocation : (symbol: Symbol, node: Node) => Type
 >symbol : Symbol
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index 9cc9c2ffd50..d850585ea37 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -820,10 +820,6 @@ declare module "typescript" {
         getEmitResolver(): EmitResolver;
         getDiagnostics(sourceFile?: SourceFile): Diagnostic[];
         getGlobalDiagnostics(): Diagnostic[];
-        getNodeCount(): number;
-        getIdentifierCount(): number;
-        getSymbolCount(): number;
-        getTypeCount(): number;
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index aaa07714c61..f84338d9d1c 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -2551,18 +2551,6 @@ declare module "typescript" {
 >getGlobalDiagnostics : () => Diagnostic[]
 >Diagnostic : Diagnostic
 
-        getNodeCount(): number;

->getNodeCount : () => number
-
-        getIdentifierCount(): number;

->getIdentifierCount : () => number
-
-        getSymbolCount(): number;

->getSymbolCount : () => number
-
-        getTypeCount(): number;

->getTypeCount : () => number
-
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;

 >getTypeOfSymbolAtLocation : (symbol: Symbol, node: Node) => Type
 >symbol : Symbol
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 201053584ac..4c86119f6a0 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -821,10 +821,6 @@ declare module "typescript" {
         getEmitResolver(): EmitResolver;
         getDiagnostics(sourceFile?: SourceFile): Diagnostic[];
         getGlobalDiagnostics(): Diagnostic[];
-        getNodeCount(): number;
-        getIdentifierCount(): number;
-        getSymbolCount(): number;
-        getTypeCount(): number;
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index 408285caaaa..2093ec7d8f5 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -2499,18 +2499,6 @@ declare module "typescript" {
 >getGlobalDiagnostics : () => Diagnostic[]
 >Diagnostic : Diagnostic
 
-        getNodeCount(): number;

->getNodeCount : () => number
-
-        getIdentifierCount(): number;

->getIdentifierCount : () => number
-
-        getSymbolCount(): number;

->getSymbolCount : () => number
-
-        getTypeCount(): number;

->getTypeCount : () => number
-
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;

 >getTypeOfSymbolAtLocation : (symbol: Symbol, node: Node) => Type
 >symbol : Symbol
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 47f40c01d8e..0e242eaca34 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -858,10 +858,6 @@ declare module "typescript" {
         getEmitResolver(): EmitResolver;
         getDiagnostics(sourceFile?: SourceFile): Diagnostic[];
         getGlobalDiagnostics(): Diagnostic[];
-        getNodeCount(): number;
-        getIdentifierCount(): number;
-        getSymbolCount(): number;
-        getTypeCount(): number;
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
         getDeclaredTypeOfSymbol(symbol: Symbol): Type;
         getPropertiesOfType(type: Type): Symbol[];
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index dfdc133817e..9255c64511c 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -2677,18 +2677,6 @@ declare module "typescript" {
 >getGlobalDiagnostics : () => Diagnostic[]
 >Diagnostic : Diagnostic
 
-        getNodeCount(): number;

->getNodeCount : () => number
-
-        getIdentifierCount(): number;

->getIdentifierCount : () => number
-
-        getSymbolCount(): number;

->getSymbolCount : () => number
-
-        getTypeCount(): number;

->getTypeCount : () => number
-
         getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;

 >getTypeOfSymbolAtLocation : (symbol: Symbol, node: Node) => Type
 >symbol : Symbol