Finished up the easy/obvious canonicalizations

We specifically need German, Russian, Polish, Japanese review.