[Git][ghc/ghc][wip/andreask/9.10.4-batch1] 28 commits: Fix a horrible shadowing bug in implicit parameters