Lexical syntax simplification
Merge remote-tracking branch 'cmr/lexical-syntax'
Fill in PR #s for RFC 21