Fix smart-hyphen punctuation and space-entities handling