Synced with latest version of xmonad.hs