final fixes for simplifyIfs