Updated and cleaned up Haskell aliases.