Continued refactoring to use *Metrics classes for building SolarSystem.