Fixed according utf8string_iterator changes.