Updates for base-4.7.0 (GHC 7.8)