New iter_pf_df logic, seemingly much simpler. Test adjustments on-going.

New iter_pf_df logic, seemingly much simpler. Test adjustments on-going. #339