Fixed parsing of two-character punctuation (credit to Sammy Mitchell).