A bunch of changes that I can't remember, and cannot be bothered
examining. I know all the tests work though.