[Git][ghc/ghc][master] Fix a horrible shadowing bug in implicit parameters