ghc prebuilt: Clean up derivations ever so slightly

These changes do break hashes, but are good to have everywhere for
consistency. Plus, changing the bootstrap causes a Haskell mass rebuild
anyways.