2 files changed, 7 insertions, 13 deletions

diff --git a/src/Network/KRPC.hs b/src/Network/KRPC.hs
index 27363515..b6e14bb0 100644
--- a/src/Network/KRPC.hs
+++ b/src/Network/KRPC.hs
@@ -125,7 +125,6 @@ import Data.BEncode.BDict as BE
 import Data.BEncode.Types as BE
 import Data.ByteString.Char8 as BC
 import Data.List as L
-import Data.Map  as M
 import Data.Monoid
 import Data.Typeable
 import Network
@@ -359,9 +358,6 @@ server :: (MonadBaseControl IO remote, MonadIO remote)
        -> remote ()
 server servAddr handlers = do
     remoteServer servAddr $ \addr q -> do
-      case dispatch (queryMethod q) of
+      case L.lookup  (queryMethod q) handlers of
         Nothing -> return $ Left $ MethodUnknown (queryMethod q)
         Just  m -> m addr q
-  where
-    handlerMap = M.fromList handlers
-    dispatch s = M.lookup s handlerMap
diff --git a/src/Network/KRPC/Scheme.hs b/src/Network/KRPC/Scheme.hs
index 9d8a1876..244f035d 100644
--- a/src/Network/KRPC/Scheme.hs
+++ b/src/Network/KRPC/Scheme.hs
@@ -23,7 +23,6 @@ module Network.KRPC.Scheme
 import Control.Applicative
 import Data.BEncode.BDict as BS
 import Data.BEncode.Types as BS
-import Data.Set as S
 
 import Network.KRPC.Protocol
 import Network.KRPC
@@ -51,7 +50,7 @@ instance KMessage KError ErrorCode where
 
 data KQueryScheme = KQueryScheme {
     qscMethod :: MethodName
-  , qscParams :: Set ParamName
+  , qscParams :: [ParamName]
   } deriving (Show, Read, Eq, Ord)
 
 bdictKeys :: BDict -> [BKey]
@@ -61,24 +60,23 @@ bdictKeys  Nil          = []
 instance KMessage KQuery KQueryScheme where
   scheme q = KQueryScheme
              { qscMethod = queryMethod q
-             , qscParams = S.fromAscList $ bdictKeys $ queryArgs q
+             , qscParams = bdictKeys $ queryArgs q
              }
   {-# INLINE scheme #-}
 
 methodQueryScheme :: Method a b -> KQueryScheme
-methodQueryScheme = KQueryScheme <$> methodName
-                                 <*> S.fromList . methodParams
+methodQueryScheme = KQueryScheme <$> methodName <*> methodParams
 {-# INLINE methodQueryScheme #-}
 
 newtype KResponseScheme = KResponseScheme
-  { rscVals :: Set ValName
+  { rscVals :: [ValName]
   } deriving (Show, Read, Eq, Ord)
 
 instance KMessage KResponse KResponseScheme where
   {-# SPECIALIZE instance KMessage KResponse KResponseScheme #-}
-  scheme = KResponseScheme . S.fromAscList . bdictKeys . respVals
+  scheme = KResponseScheme . bdictKeys . respVals
   {-# INLINE scheme #-}
 
 methodRespScheme :: Method a b -> KResponseScheme
-methodRespScheme = KResponseScheme . S.fromList . methodVals
+methodRespScheme = KResponseScheme . methodVals
 {-# INLINE methodRespScheme #-}