Almost ready for GHC 7.8