[Git][ghc/ghc][wip/T27994] Fix niFixSubst again