Add environment-variable substitution to config options