Fix one last instance of iteritems for Python 3.
WIP: Progress toward Python3 and proper unicode handling.