1 files changed, 7 insertions, 9 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 6176bbe6..8f32535a 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -258,22 +258,20 @@ xmlStream conread conwrite = (xsrc,xsnk)
     xsrc = src $= XML.parseBytes XML.def
     xsnk :: Sink (Flush Event) IO ()
     xsnk = -- XML.renderBytes XML.def =$ snk
-        renderBuilderFlush XML.def 
-        =$= builderToByteStringFlush 
-        =$= discardFlush 
+        renderBuilderFlush XML.def
+        =$= builderToByteStringFlush
+        =$= discardFlush
         =$ snk
       where
         discardFlush :: Monad m => ConduitM (Flush a) a m ()
-        discardFlush = awaitForever $ \x -> do
-            let unchunk (Chunk a) = a
-                ischunk (Chunk _) = True
-                ischunk _         = False
-            when (ischunk x) $ yield (unchunk x)
+        discardFlush = awaitForever yieldChunk
+        yieldChunk (Chunk x) = yield x
+        yieldChunk _ = return ()
 
     src = do
         v <- lift conread
         maybe (return ()) -- lift . wlog $ "conread: Nothing")
-              (\v -> yield v >> src)
+              (yield >=> const src)
               v
     snk = awaitForever $ liftIO . conwrite