diff --git a/src/client.rs b/src/client.rs
index a94e302..c17f0e9 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -15,7 +15,7 @@ use tokio_core::reactor;
 use tokio_proto::easy::{EasyClient, EasyResponse, multiplex};
 use tokio_service::Service;
 
-/// A client `Service` that writes and reads bytes.
+/// A client that impls `tokio_service::Service` that writes and reads bytes.
 ///
 /// Typically, this would be combined with a serialization pre-processing step
 /// and a deserialization post-processing step.
@@ -137,10 +137,7 @@ pub mod future {
         type Error = io::Error;
 
         fn poll(&mut self) -> futures::Poll<Self::Item, Self::Error> {
-            match self.inner.poll()? {
-                Async::Ready(client) => Ok(Async::Ready(client)),
-                Async::NotReady => Ok(Async::NotReady),
-            }
+            self.inner.poll()
         }
     }
 
diff --git a/src/framed.rs b/src/framed.rs
index 9185239..f9a0542 100644
--- a/src/framed.rs
+++ b/src/framed.rs
@@ -63,6 +63,7 @@ impl<I, In, Out> FramedIo for Framed<I, In, Out>
     }
 }
 
+// `T` is the type that `Parser` parses.
 struct Parser<T> {
     state: ParserState,
     _phantom_data: PhantomData<T>,