Revise how environment variables are handled when they are based on namespace variables.