Changes needed for ghc 7.