minor cleanups to Iterator code