Updating for GHC 7.8