Use six.string_types instead of our own workaround