Initial work on GHC 7.7 compatibility