Improve handling of environment variables.