Varibles within macros must be within brackets!

No faults here, but macro variables not within brackets could lead to trouble.