Minor refactoring of Entry.