More reconciliation of parser with lexer