Update for ghc 4.7