Settled on a control-flow model for the parser