Removed unused lexer rule.
Added parameter expansion in macros.