Moved self.single_punc_token() code into punctuation.rs. Combined self.single_punc_token() and self.multi_punc_token() into self.punctuation_token().