Haskell code cleanup.