Minor Haskell specfic tweaks