Changes for more recent versions of ghc