Index: /branches/working-0711/ccl/level-1/l1-unicode.lisp
===================================================================
--- /branches/working-0711/ccl/level-1/l1-unicode.lisp	(revision 9632)
+++ /branches/working-0711/ccl/level-1/l1-unicode.lisp	(revision 9633)
@@ -3335,5 +3335,5 @@
              (index idx))
             ((= index end) index)
-         (declare (fixnum i len index))
+         (declare (fixnum i end index))
          (let* ((1st-unit (%native-u8-ref-u16 vector index)))
            (declare (type (unsigned-byte 16) 1st-unit))
@@ -3379,5 +3379,5 @@
              (index idx))
             ((>= index end) index)
-         (declare (fixnum i index p))
+         (declare (fixnum i index end))
          (let* ((1st-unit (%get-unsigned-word pointer index)))
            (declare (type (unsigned-byte 16) 1st-unit))
@@ -3499,5 +3499,5 @@
            (index idx))
           ((= index end) index)
-       (declare (fixnum i len index))
+       (declare (fixnum i end index))
        (let* ((1st-unit (%reversed-u8-ref-u16 vector index)))
          (declare (type (unsigned-byte 16) 1st-unit))
@@ -3543,5 +3543,5 @@
            (index idx))
           ((>= index end) index)
-       (declare (fixnum i index p))
+       (declare (fixnum i index end))
        (let* ((1st-unit (%swap-u16 (%get-unsigned-word pointer index))))
          (declare (type (unsigned-byte 16) 1st-unit))
@@ -3679,5 +3679,5 @@
              (index idx))
             ((= index end) index)
-         (declare (fixnum i len index))
+         (declare (fixnum i end index))
          (let* ((1st-unit (if swap
                             (%reversed-u8-ref-u16 vector index)
@@ -3712,5 +3712,5 @@
               (highbits (- code #x10000)))
          (declare (type (mod #x110000) code)
-                  (fixnum p highbits))
+                  (fixnum highbits))
          (cond ((< highbits 0)
                 (setf (%get-unsigned-word pointer idx) code)
@@ -3725,5 +3725,5 @@
    utf-16-memory-decode
    (lambda (pointer noctets idx string)
-     (declare (fixnum nunits idx))
+     (declare (fixnum noctets idx))
      (let* ((swap (when (> noctets 1)
                     (case (%get-unsigned-word pointer idx)
@@ -3741,5 +3741,5 @@
              (index idx ))
             ((>= index end) index)
-         (declare (fixnum i index p))
+         (declare (fixnum i index end))
          (let* ((1st-unit (%get-unsigned-word pointer index)))
            (declare (type (unsigned-byte 16) 1st-unit))
@@ -3919,5 +3919,5 @@
            (index idx (+ 2 index)))
           ((>= index end) index)
-       (declare (fixnum i len index))
+       (declare (fixnum i end index))
        (setf (schar string i)
              (or (code-char (%native-u8-ref-u16 vector index))
@@ -4007,5 +4007,5 @@
            (index idx (+ 2 index)))
           ((>= index end) index)
-       (declare (fixnum i len index))
+       (declare (fixnum i end index))
        (setf (schar string i)
              (or (code-char (%reversed-u8-ref-u16 vector index))
@@ -4098,5 +4098,5 @@
              (index idx (1+ index)))
             ((>= index end) index)
-         (declare (fixnum i len index))
+         (declare (fixnum i end index))
          (let* ((1st-unit (if swap
                             (%reversed-u8-ref-u16 vector index)
@@ -4313,5 +4313,5 @@
            (index idx (+ 4 index)))
           ((>= index end) index)
-       (declare (fixnum i len index))
+       (declare (fixnum i end index))
        (let* ((code (%native-u8-ref-u32 vector index)))
          (declare (type (unsigned-byte 32) code))
@@ -4410,5 +4410,5 @@
            (index idx (+ 4 index)))
           ((>= index end) index)
-       (declare (fixnum i len index))
+       (declare (fixnum i end index))
        (let* ((code (%reversed-u8-ref-u32 vector index)))
          (declare (type (unsigned-byte 32) code))
@@ -4510,5 +4510,5 @@
              (index idx (1+ index)))
             ((>= index end) index)
-         (declare (fixnum i len index))
+         (declare (fixnum i end index))
          (let* ((1st-unit (if swap
                             (%reversed-u8-ref-u32 vector index)