Fix more iteration stuff.