CRM-13793 cleanup - assignment in condition, changed to test for
equality