Some of the debug iterator code seems to not like 'delete map[key]', so change things a little to do things in a way that appears to be fine.
