[Git][ghc/ghc][wip/andreask/build-opt] 2 commits: Clean up Instances.hs-boot a bit