CRM-13793 cleanup of assignment in condition