Eliminate self-calls during branch fixup

Drop empty entries as well
Hide EntryData internals