accumulated changes from #haskell's lambdabot