Improve some quoting consistency