Fix matching of space around punctuation