fix some punctuation irregularities after rejoining tokens