Fix some kanji-specific edge cases.