[Git][ghc/ghc][wip/spj-reinstallable-base] 2 commits: More and more