Improve font-locking of punctuation characters