More progress towards Incremental parsing