giza: refactor content iterators