anchor.diff:    (let (stream)
         (handler-case
             (progn
  -            (setf stream (make-file-stream 'mp3-file-stream filename))
  +            (setf stream (make-file-stream filename))
               (id3-frame:find-id3-frames stream)
               (when get-audio-info
                 (setf (audio-info stream) (mpeg:get-mpeg-audio-info stream))))
           (id3-frame:id3-frame-condition (c)
  -          (warn-user "make-mp3-stream got condition: ~a" c)
  +          (utils:warn-user "make-mp3-stream got condition: ~a" c)
             (when stream (stream-close stream))
             (setf stream nil)))
       stream))
  
positive.code:     (2 (stream-decode-ucs-be-string octets :start start :end end))
      (3 (stream-decode-utf-8-string octets  :start start :end end))))
  
  (defmethod stream-read-iso-string-with-len ((instream base-stream) len)
    "Read an iso-8859-1 string of length 'len' (encoding = 0)"
    (let ((octets (stream-read-sequence instream len)))
      (stream-decode-iso-string octets)))
  
  (defmethod stream-read-ucs-string-with-len ((instream base-stream) len)
    "Read an ucs-2 string of length 'len' (encoding = 1)"
    (let ((octets (stream-read-sequence instream len)))
        (stream-decode-ucs-string octets)))
  
  (defmethod stream-read-ucs-be-string-with-len ((instream base-stream) len)
    "Read an ucs-2-be string of length 'len' (encoding = 2)"
    (let ((octets (stream-read-sequence instream len)))
      (stream-decode-ucs-be-string octets)))
  
  (defmethod stream-read-utf-8-string-with-len ((instream base-stream) len)
    "Read an utf-8 string of length 'len' (encoding = 3)"
    (let ((octets (stream-read-sequence instream len)))
      (stream-decode-utf-8-string octets)))
  
  (defmethod stream-read-string-with-len ((instream base-stream) len &key (encoding 0))
    "Read in a string of a given encoding of length 'len'"
    (ecase encoding
      (0 (stream-read-iso-string-with-len instream len))
  
negative.code:                     (write-byte b1 out)))))
      (stream-decode-ucs-be-string octets)))
  
  (defmethod stream-read-utf-8-string ((instream mem-stream))
    "Read in a null terminated utf-8 string (encoding == 3)"
    (let ((octets (ccl:with-output-to-vector (out)
                    (do ((b (stream-read-u8 instream)
  