repairs for recent haskell-src-exts