Update to use my haskell-src-exts modifications