More parser simplification.