:internal: some more improvments for the iterator