Cleaned up some internal utf8 stuff
Addresses RT #92864