Miscellaneous changes required for ghc-mod with ghc-7.8.4