Updated to build on GHC 7.8 rc2