1 files changed, 13 insertions, 13 deletions

diff --git a/src/Network/QueryResponse.hs b/src/Network/QueryResponse.hs
index b6fea4a9..f6f2807d 100644
--- a/src/Network/QueryResponse.hs
+++ b/src/Network/QueryResponse.hs
@@ -39,7 +39,7 @@ import Data.Maybe
 --  > r <- sendQuery client method q
 --  > -- Quit client.
 --  > quitServer
-forkListener :: Client err tbl meth tid addr x ctx -> IO (IO ())
+forkListener :: Client err meth tid addr x ctx -> IO (IO ())
 forkListener client = do
     thread_id <- forkIO $ do
         myThreadId >>= flip labelThread "listener"
@@ -53,11 +53,11 @@ forkListener client = do
 -- dispatch the response.
 sendQuery ::
     forall err a b tbl x ctx meth tid addr.
-        Client err tbl meth tid addr x ctx -- ^ A query/response implementation.
-        -> MethodSerializer addr x ctx meth a b      -- ^ Information for marshalling the query.
-        -> a                               -- ^ The outbound query.
-        -> addr                            -- ^ Destination address of query.
-        -> IO (Maybe b)                    -- ^ The response, or 'Nothing' if it timed out.
+        Client err meth tid addr x ctx          -- ^ A query/response implementation.
+        -> MethodSerializer addr x ctx meth a b -- ^ Information for marshalling the query.
+        -> a                                    -- ^ The outbound query.
+        -> addr                                 -- ^ Destination address of query.
+        -> IO (Maybe b)                         -- ^ The response, or 'Nothing' if it timed out.
 sendQuery (Client net d err pending whoami) meth q addr = do
     mvar <- newEmptyMVar
     tid <- atomically $ do
@@ -78,7 +78,7 @@ sendQuery (Client net d err pending whoami) meth q addr = do
 -- * Implementing a query\/response 'Client'.
 
 -- | All inputs required to implement a query\/response client.
-data Client err tbl meth tid addr x ctx = Client
+data Client err meth tid addr x ctx = forall tbl. Client
     { -- | The 'Transport' used to dispatch and receive packets.
       clientNet :: Transport err addr x
       -- | Methods for handling inbound packets.
@@ -118,11 +118,11 @@ data MethodHandler err tid addr x ctx = forall a b. MethodHandler
 -- parse is successful, the returned IO action will construct our reply.
 -- Otherwise, a parse err is returned.
 dispatchQuery :: MethodHandler err tid addr x ctx -- ^ Handler to invoke.
-                 -> ctx                       -- ^ Arbitrary context used during serialization.
-                 -> tid                       -- ^ The transaction id for this query\/response session.
-                 -> addr                      -- ^ Our own address, to which the query was sent.
-                 -> x                         -- ^ The query packet.
-                 -> addr                      -- ^ The origin address of the query.
+                 -> ctx                           -- ^ Arbitrary context used during serialization.
+                 -> tid                           -- ^ The transaction id for this query\/response session.
+                 -> addr                          -- ^ Our own address, to which the query was sent.
+                 -> x                             -- ^ The query packet.
+                 -> addr                          -- ^ The origin address of the query.
                  -> Either err (IO x)
 dispatchQuery (MethodHandler unwrapQ wrapR f) ctx tid self x addr =
     fmap (\a -> wrapR ctx tid self addr <$> f addr a) $ unwrapQ x
@@ -269,7 +269,7 @@ data ErrorReporter addr x meth tid err = ErrorReporter
 -- 'fix' in a forked thread that loops until 'awaitMessage' returns 'Nothing'
 -- or throws an exception.
 handleMessage ::
-    Client err tbl meth tid addr x ctx
+    Client err meth tid addr x ctx
     -> IO ()
     -> IO ()
 handleMessage (Client net d err pending whoami) again = do