Added parentheses around macros in Tone.c