At the risk of asking the obvious... did you also remove the parentheses where these macros were used later on?