(Bsmiles32) Backport - Replace EntryLo0/EntryLo1 macros