Consistently use "unicode" rather than "str"