Fix iterator type.

See diff.