Minor fixes to Haskell version.