Match changes in haskell-src-exts-1.16