Another SpaceState simplification

Probably didn't remove a dependency, but still for the best.