Changes to reflect refactoring in GHC as part of #7484