CRM-13793 code cleanup assignment in condition; one bug fix line 120/122