More quoting tweaks