Better support for utf-8 character names.