More Spacetypedescriptor refactoring