allowing variable number of arguments for non-argument macros

There are mainly just 4 new lines. All the other changes are just an indentation by one tab.