--- mapping.lisp.orig	2008-05-25 15:07:53.000000000 -0400
+++ mapping.lisp	2008-07-15 22:10:56.000000000 -0400
@@ -47,7 +47,8 @@
 
 (deftype char-code-integer ()
   "The subtype of integers which can be returned by the function CHAR-CODE."
-  '(integer 0 #.(1- char-code-limit)))
+  #-:cmu '(integer 0 #.(1- char-code-limit))
+  #+:cmu '(integer 0 65533))
 
 (deftype code-point ()
   "The subtype of integers that's just big enough to hold all Unicode
