Use six string_types/text_type wherever possible