Some coding style (quote format) fixes, also closes #1109 (no CHANGELOG entry for stuff like this as usual)