Structural refactors on the environment side of things.