Rework the computation of a sub-structure natural type. There were