Moved punctuation into base recode set