[Git][ghc/ghc][wip/spj-reinstallable-base] 15 commits: Refactor eta-expansion in Prep