More to the point, the extruded and non-extruded cases now do exactly the same thing, so there should be no branches here at all.