More ghc 7.6 compatibility