[Git][ghc/ghc][wip/az/exactprint-annotation-rationalisation] 12 commits: Exactprint: tidy up layout capturing