MAINT: Fixup more dictionary fixer fixes.

Most of these are places where an iterator will work as well as a
list, but two fix places where `iterkeys` was introduced which is
a bug.