Make it 0.16 compatible again (text iterators).