Make parser more RCL-compliant.