Add back in UTF16String and Uint32 character support.