Smarter handling of uniXXXX names in the Unicode test.