In the future, I'd like that we try to not do simple cleanup in big patches, as this messes up history. (I know I do this as well, this is very tempting -- do what I say, not what I do :p).