Further fix for #29 - ignoring macros with spaces