Haskell filetype fixes

I suppose (hope) that my previous pull requests were ignored simply due to lack of description and clarification on the changes. I'll comment in the diff.