XD-224: more flexible quoting options

Addresses https://jira.springsource.org/browse/XD-224