diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 871eaa3..13349cc 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -518,17 +518,10 @@
     return PyUnicode_FromOrdinal(x);
 }
 
-PyDoc_VAR(chr_doc) = PyDoc_STR(
+PyDoc_STRVAR(chr_doc,
 "chr(i) -> Unicode character\n\
 \n\
-Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff."
-)
-#ifndef Py_UNICODE_WIDE
-PyDoc_STR(
-"\nIf 0x10000 <= i, a surrogate pair is returned."
-)
-#endif
-;
+Return a Unicode string of one character with ordinal i; 0 <= i <= 0x10ffff.");
 
 
 static char *
diff --git a/Python/traceback.c b/Python/traceback.c
index 2f4653b..c8b3ee1 100644
--- a/Python/traceback.c
+++ b/Python/traceback.c
@@ -526,23 +526,17 @@
             char c = (char)ch;
             write(fd, &c, 1);
         }
-        else if (ch < 256) {
+        else if (ch < 0xff) {
             PUTS(fd, "\\x");
             dump_hexadecimal(2, ch, fd);
         }
-        else
-#ifdef Py_UNICODE_WIDE
-        if (ch < 65536)
-#endif
-        {
+        else if (ch < 0xffff) {
             PUTS(fd, "\\u");
             dump_hexadecimal(4, ch, fd);
-#ifdef Py_UNICODE_WIDE
         }
         else {
             PUTS(fd, "\\U");
             dump_hexadecimal(8, ch, fd);
-#endif
         }
     }
     if (truncated)