Rewrite s-if-else synthesis to be easier to follow.