The patch for adding support for macros with arguments contained a leftover debugging aid. This patch corrects the code. It also should eliminate some compilation warnings.