Various tweaks via ghc-mod.