That requires me to change more things elsewhere, which seems sort of pointless given that the whole setup disappears once the extruded facets stuff lands.  All I am doing here is keeping the same structure as before but pulling the extruded things off the set onto an extruded set.