[Git][ghc/ghc][master] Fix scoping errors in specialisation