Add export for iterator type, needed for R16.