Another run of non-ASCII cleanup. Grrrr!