trivial ghc-7.6 updates