EAGLESIX-2699 more enhancements to the $cond code.