Remove more unused includes
Use map, not unordered_map in Grammar
Don't extract isolated blanks from grammars into tokens
Change repeat to mean zero-or-more in lexical rules

Still need to make it work this way in syntactic rules