[Git][ghc/ghc][master] 2 commits: Refactor distinct constructor tables map construction