[Git][ghc/ghc][wip/lazifier] Clean up diff