Simplify some more CPP __GLASGOW_HASKELL__ tests