Help the cherry-pick of escaping environment values as needed.