more CompositeIterator stl-related design changes