diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py
index 7654a0b9e05..48730c225ab 100644
--- a/Lib/asyncio/coroutines.py
+++ b/Lib/asyncio/coroutines.py
@@ -166,11 +166,11 @@ def iscoroutinefunction(func):
     return getattr(func, '_is_coroutine', False)
 
 
-_COROUTINE_TYPES = (CoroWrapper, types.GeneratorType)
+_COROUTINE_TYPES = (types.GeneratorType, CoroWrapper)
 
 def iscoroutine(obj):
     """Return True if obj is a coroutine object."""
-    return isinstance(obj,  _COROUTINE_TYPES)
+    return isinstance(obj, _COROUTINE_TYPES)
 
 
 def _format_coroutine(coro):
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index a80876f366a..23545c9ee9d 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -38,7 +38,7 @@ def __init__(self, loop, sock, protocol, waiter=None,
             self._server.attach(self)
         self._loop.call_soon(self._protocol.connection_made, self)
         if waiter is not None:
-            self._loop.call_soon(waiter._set_result_unless_cancelled, None)
+            waiter.set_result(None)
 
     def _set_extra(self, sock):
         self._extra['pipe'] = sock
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 2a170340b9e..628efb750ca 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -481,7 +481,7 @@ def __init__(self, loop, sock, protocol, waiter=None,
         self._loop.add_reader(self._sock_fd, self._read_ready)
         self._loop.call_soon(self._protocol.connection_made, self)
         if waiter is not None:
-            self._loop.call_soon(waiter._set_result_unless_cancelled, None)
+            waiter.set_result(None)
 
     def pause_reading(self):
         if self._closing: