cleanups, especially in ucnv.cpp