Refactored Space loading a bit

Mostly as a step towards making it unit-testable, before I try to
introduce Model Types.