[Git][ghc/ghc] Pushed new branch wip/ani/better-expansion