Fixed #28: Make better use of the $_ENV variables in the Environment class.