Parenthesize more defensively in macro definition.