Keep spaces after commas and brackets (related to issue 6730)