(master) Refactor EntryView usage (Follow up #2538).

Follow up #2538