diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts
index 23b1d178f24..ea35630cf37 100644
--- a/src/vs/base/common/winjs.base.d.ts
+++ b/src/vs/base/common/winjs.base.d.ts
@@ -28,17 +28,17 @@ export declare class Promise {
 
 	static join(promises: { [name: string]: Promise; }): Promise;
 	static join(promises: Promise[]): Promise;
-	static any(promises: Promise[]): Promise;
+	// static any(promises: Promise[]): Promise;
 
 	// commented out to speed up adoption of TPromise
 	// static timeout(delay:number):Promise;
 
 	static wrapError(error: any): Promise;
-	static is(value: any): value is Thenable<any>;
-	static addEventListener(type: string, fn: EventCallback): void;
+	// static is(value: any): value is Thenable<any>;
+	// static addEventListener(type: string, fn: EventCallback): void;
 
 	public then(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): Promise;
-	public then<U>(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): TPromise<U>;
+	// public then<U>(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): TPromise<U>;
 	public done(success?: ValueCallback, error?: ErrorCallback, progress?: ProgressCallback): void;
 	public cancel(): void;
 }
@@ -78,7 +78,12 @@ export declare class TPromise<V> {
 	public done(success?: (value: V) => void, error?: (err: any) => any, progress?: ProgressCallback): void;
 	public cancel(): void;
 
+	public static as(value: null): TPromise<null>;
+	public static as(value: undefined): TPromise<undefined>;
+	public static as<ValueType>(value: TPromise<ValueType>): TPromise<ValueType>;
+	public static as<ValueType>(value: Thenable<ValueType>): Thenable<ValueType>;
 	public static as<ValueType>(value: ValueType): TPromise<ValueType>;
+
 	public static is(value: any): value is Thenable<any>;
 	public static timeout(delay: number): TPromise<void>;
 	public static join<ValueType>(promises: TPromise<ValueType>[]): TPromise<ValueType[]>;
@@ -113,4 +118,4 @@ export declare class PPromise<C, P> extends TPromise<C> {
 	public static join<C, P>(promises: { [n: string]: PPromise<C, P> }): PPromise<{ [n: string]: C }, P>;
 	public static any<C, P>(promises: PPromise<C, P>[]): PPromise<{ key: string; value: PPromise<C, P>; }, P>;
 	public static wrapError<V>(error: any): TPromise<V>;
-}
\ No newline at end of file
+}
diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
index 053a8d30f25..e4a0bb2647b 100644
--- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
@@ -373,7 +373,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		this.throttler.queue(() => {
 			return state.validate(this.editor)
 				? this.findDefinition(mouseEvent.target)
-				: TPromise.as(null);
+				: TPromise.as<Location[]>(null);
 
 		}).then(results => {
 			if (!results || !results.length || !state.validate(this.editor)) {
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index d6af73f63df..2be64bae096 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -74,7 +74,12 @@ declare module monaco {
         public done(success?: (value: V) => void, error?: (err: any) => any, progress?: ProgressCallback): void;
         public cancel(): void;
 
+        public static as(value: null): Promise<null>;
+        public static as(value: undefined): Promise<undefined>;
+        public static as<ValueType>(value: Promise<ValueType>): Promise<ValueType>;
+        public static as<ValueType>(value: Thenable<ValueType>): Thenable<ValueType>;
         public static as<ValueType>(value: ValueType): Promise<ValueType>;
+
         public static is(value: any): value is Thenable<any>;
         public static timeout(delay: number): Promise<void>;
         public static join<ValueType>(promises: Promise<ValueType>[]): Promise<ValueType[]>;