The main benefit of this is code coverage gains can actually follow it. Also removes most ugly os.environ hacks.