Partial work refactoring Singletons to regular instances for Simulation/Scenario variables