CB-7142 syntax cleanup