Get rid of more uses of string and use unicode
7 files changed