Added argument-less rules
Made undefined value macros turn into literal strings
Added rule macro shadowing
Added rule macro shadowing