Merge "Refactor WordIterator to avoid copying to internal buffers"