While I was doing #446, I also fixed these where I could find them. This will cause a merge conflict here as well, until your comments are removed.