CXX-230 fixup quoting