Fixed a bug with comments and whitespace in macro call, macros now keep newlines