Sorry about breaking the tree with typos, I think this should fix all of them. This commit was SVN r7482.