[Git][ghc/ghc][wip/az/ghc-cpp] Some cleanups