Don't set the body of If to the original type.

Tweak the way we set tpe = Unit in matches.