[Git][ghc/ghc][wip/az/exactprint-annotation-rationalisation] 58 commits: Fix a number of incorrect module references: