SysML: Minor refactorings.