Alter entries iterator behavior

The old setup would have locked the implementation to storing keys and
values together