Also use >= MACRO rather than comparing with (MACRO - 1).