Improve variable quoting