ghc-9999 cross patches no longer apply (upstream made lots of changes).