Added macro keyword
Noted that "then" is now reserved