Corrected minor annoyance
Made macros less volatile