More tweaking of punctuation collapse rules.