remove/update many of the references to dict.iter*()