diff --git a/meta-src.lisp b/meta-src.lisp
index 96fdaea39cf1acad595def4b3acdc7ad25539f04..d9fe49abc5d1aec9600f99e2df622ca1fb8365f5 100644
--- a/meta-src.lisp
+++ b/meta-src.lisp
@@ -1,8 +1,9 @@
-;;;;										;
+;;;;
 ;;;; (c) 2001 by Jochen Schmidt.
+;;;; (c) 2009-2012 by Francois-Rene Rideau
 ;;;;
 ;;;; File:            meta.lisp
-;;;; Revision:        1.0.0
+;;;; Revision:        1.0.0 - plus modifications by Francois-Rene Rideau
 ;;;; Description:     A simple parsing technique
 ;;;; Date:            01.07.2001
 ;;;; Authors:         Jochen Schmidt
@@ -71,7 +72,7 @@
   (let ((char-sym (gensym)))
     `(when (< index end)
        (let ((,char-sym (char ,source-symbol index)))
-         (declare (base-char ,char-sym))
+         (declare (type character ,char-sym))
          (when (typep ,char-sym ',x)
            (setq ,v ,char-sym) (incf index))))))
 
@@ -179,7 +180,7 @@
   `(let* ((,source-symbol ,string-buffer)
           (index ,start)
           (end ,(or end `(length ,source-symbol))))
-     (declare (fixnum index end)
+     (declare (type fixnum index end)
               (type simple-string ,source-symbol))
      (macrolet ((match (x)
                   (compileit x