More small xmonad cleanups.