More quoting fixes.