(Bsmiles32) Backport - replace WatchLo/WatchHi macros