Clean up entries iterator a bit