Tidy up a few more things, and leave a reminder for the Korean/Japanese diacritics.