Structural work to eventually remove global state