[Git][ghc/ghc][wip/andreask/cfg-fix] Another CFG Fix