Be slightly more consistent about quoting.