(charset_at_position): Function removed. (init_iterator): Don't set member charset of struct `it'. (handle_face_prop, reseat_to_string, set_iterator_to_next, next_element_from_display_vector, insert_left_trunc_glyphs): Likewise. (face_before_or_after_it_pos): Call FACE_FOR_CHAR, not FACE_FOR_CHARSET. (get_next_display_element, append_space, extend_face_to_end_of_line): Likewise.