move envvar lookups to opdemand module