Fixes to conditional-assignment detector (2)