XX-11179:  Correcting invalid expressions uncovered by Coverity Scan