Fixes to conditional-assignment detector
Fixes to conditional-assignment detector