Update for GHC 7.8