Cosmetic Iterator<> cleanups