* Begin rewrite of punctuation parser