Tweaks to IfCondition.