[Git][ghc/ghc] Pushed new branch wip/ctoi-refactor