turn the debug()-calls in in trace()-calls again (commited by accident)
Fix a CppGrammar issue when parsing a function-like macro instance