Refs #9369 Fix rest of iterator issues.