Fixup for some unfortunate choices for handling environment variables.