FIX: Change `itervalues`, `iteritems` to `values`, `items` to work on both Python 2 and Python 3..