Substitution Optimization takes now in account operations in conditionals.