Remove use of deprecated StrAndUnicode base class