Changed split_iterator to find_iterator so that we could cut off the end
of a string that would have wrapped otherwise.  Rewrote the wrap
strategies.