Cleanup / progress on new Iterator<> OwnerID code