Better token info, state-machine-based has feature-parity with old parser