Some tidying post-unicode-merge: typos, tense, simplification, filling.