Update for s/_iter// and de-do.