Lexer now returns a name map. Next job is to finish the parser.