Given the deprecation of `iteritems`, I think updating these to be `viewitems` or `items` (which I prefer) would be a good idea. I decided that this should be a separate pull request since it technically changes the API. I did gut the insides though, sorry @stendec !