Add macro robustness, missing Tau definition

Macros with multiple terms should be parenthesized to prevent replacement errors.

Tau = 2 Pi. Added it for completeness.