Further UTF-8 support work.