some CHAR_T cleanups