Fixed macro expansion when a function macro was invoked without parameters, optimized setToken a bit