Rework environment variables.