Be more consistent about use of double-quotes