Fix an oddity about spacing around punctuation