Minor tweaks to Ocaml and Haskell mode. Also minor changes to structure.