More smvgear to Manager refactorings.