AC-7999. Another refinement to the parsing syntax