(Bsmiles32) Backport - Replace Compare macro