Improved use of environment variables.