Some small parser simplifications and a new system for multiple parser paths