Update for haskell-src-exts-1.16