(Bsmiles32) Backport - Replace TagLo/TagHi macros