* More utf-8 fixes from Recai, partly to things I broke above: