Fix extra spaces around hyphens (and other tokens)