Tweaks to IfConditions