Match changes required in ghc-mod
WIP