Fix x-strings to remove need of double-escaping