diff --git a/lib/core.js b/lib/core.js
index 9fa57c32d06..697882cf305 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -547,19 +547,21 @@ type IteratorResult<Yield,Return> =
   | { done: true, value?: Return }
   | { done: false, value: Yield };
 
-interface $Iterator<+Yield,+Return,-Next> {
-    @@iterator(): $Iterator<Yield,Return,Next>;
-    next(value?: Next): IteratorResult<Yield,Return>;
-}
-type Iterator<+T> = $Iterator<T,void,void>;
-
 interface $Iterable<+Yield,+Return,-Next> {
     @@iterator(): $Iterator<Yield,Return,Next>;
 }
 type Iterable<+T> = $Iterable<T,void,void>;
 
-interface Generator<+Yield,+Return,-Next> {
-    @@iterator(): $Iterator<Yield,Return,Next>;
+interface $Iterator<+Yield,+Return,-Next> implements $Iterable<Yield,Return,Next> {
+    @@iterator(): this;
+    next(value?: Next): IteratorResult<Yield,Return>;
+    return?: <R>(value: R) => IteratorResult<Yield,R|Return>;
+    throw?: (error?: any) => IteratorResult<Yield,Return>;
+}
+type Iterator<+T> = $Iterator<T,void,void>;
+
+interface Generator<+Yield,+Return,-Next> implements $Iterator<Yield,Return,Next> {
+    @@iterator(): this;
     next(value?: Next): IteratorResult<Yield,Return>;
     return<R>(value: R): IteratorResult<Yield,R|Return>;
     throw(error?: any): IteratorResult<Yield,Return>;
@@ -569,25 +571,27 @@ declare function $iterate<T>(p: Iterable<T>): T;
 
 /* Async Iterable/Iterator/Generator */
 
-interface $AsyncIterator<+Yield,+Return,-Next> {
-    @@asyncIterator(): $AsyncIterator<Yield,Return,Next>;
-    next(value?: Next): Promise<IteratorResult<Yield,Return>>;
-}
-type AsyncIterator<+T> = $AsyncIterator<T,void,void>;
-
 interface $AsyncIterable<+Yield,+Return,-Next> {
     @@asyncIterator(): $AsyncIterator<Yield,Return,Next>;
 }
 type AsyncIterable<+T> = $AsyncIterable<T,void,void>;
 
-interface AsyncGenerator<+Yield,+Return,-Next> {
-    @@asyncIterator(): $AsyncIterator<Yield,Return,Next>;
+interface $AsyncIterator<+Yield,+Return,-Next> implements $AsyncIterable<Yield,Return,Next> {
+    @@asyncIterator(): this;
+    next(value?: Next): Promise<IteratorResult<Yield,Return>>;
+    return?: <R>(value: R) => Promise<IteratorResult<Yield,R|Return>>;
+    throw? (error?: any) => Promise<IteratorResult<Yield,Return>>;
+}
+type AsyncIterator<+T> = $AsyncIterator<T,void,void>;
+
+interface AsyncGenerator<+Yield,+Return,-Next> implements $AsyncIterator {
+    @@asyncIterator(): this;
     next(value?: Next): Promise<IteratorResult<Yield,Return>>;
     return<R>(value: R): Promise<IteratorResult<Yield,R|Return>>;
     throw(error?: any): Promise<IteratorResult<Yield,Return>>;
 }
 
-declare function $asyncIterator<T>(p: AsyncIterable<T>): T;
+declare function $asyncIterate<T>(p: AsyncIterable<T>): T;
 
 /* Maps and Sets */