More internal refactoring of SRuS in preparation for SED-ML Nested Task support.