Fixing up some Haskell support.