1 files changed, 5 insertions, 4 deletions
diff --git a/src/Xmobar/System/Environment.hs b/src/Xmobar/System/Environment.hs
index 25802fe..0491bcc 100644
--- a/src/Xmobar/System/Environment.hs
+++ b/src/Xmobar/System/Environment.hs
@@ -13,14 +13,14 @@
 -----------------------------------------------------------------------------
 module Xmobar.System.Environment(expandEnv) where
 
-import Data.Maybe (fromMaybe)
-import System.Environment   (lookupEnv)
+import qualified Data.Maybe as M
+import qualified System.Environment as E
 
 expandEnv :: String -> IO String
 expandEnv "" = return ""
 expandEnv (c:s) = case c of
   '$'       -> do
-    envVar <- fromMaybe "" <$> lookupEnv e
+    envVar <- M.fromMaybe "" <$> E.lookupEnv e
     remainder <- expandEnv s'
     return $ envVar ++ remainder
     where (e, s') = getVar s
@@ -36,12 +36,13 @@ expandEnv (c:s) = case c of
     False -> do
       remainder <- expandEnv $ drop 1 s
       return $ escString s ++ remainder
-      where escString s' = let (cc:_) = s' in
+      where escString (cc:_) =
               case cc of
                 't' -> "\t"
                 'n' -> "\n"
                 '$' -> "$"
                 _   -> [cc]
+            escString [] = ""
 
   _    -> do
     remainder <- expandEnv s