cleanups after dealing with unicode that is > 2^16 in a narrow build