Fix up Safe Haskell tests for recent ghc changes.