Improved compatibility with pre-7.7 versions of GHC