Reserve all uses of raw ${} in macro definitions, not just