More work on the simplified parser