Ensure envvars are enclosed to preserve whitespace