minor efficiency improvements to iterator methods