More work on fixing issues from C++ transliteration...