don't add duplicate whitespace when token ends with a quote or comma