Correctly escape more characters.