More parser simplification