Modify IfExp method and post condition part of SUBSTITUTION