Quoting fixes.