continue dealing with fallout from reorg
eliminate term "invariant subtype"