More ghc7.8.2 fixes, no guarantees yet.