Updates by ghc-Forestier