[PATCH 2/2] Add C++ iterators