Better support for GHC < 7.8