Updated for ghc-7.8.3