Tidied up ucnv.cpp