- remove all parsing heuristics - as a result, accept a wider syntax, but parser is simpler R=r OCL=25029 CL=25029