dict.iteritems() is no more.
Also, fix a misleading comment (leftover from a previous
implementation).