Fix several Haskell expressions to work with GHC 7.8.2