NXP-13113: clean up use of DocumentModelIterator