Added c++ fix for ToUpper/ToLower and unicode.