diff --git a/sources/CMLPATHNAME b/sources/CMLPATHNAME
index 5c4d79d4..0c0bff9c 100644
--- a/sources/CMLPATHNAME
+++ b/sources/CMLPATHNAME
@@ -1,13 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "28-Sep-90 15:14:19" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>CMLPATHNAME.;9| 42057  
 
-      changes to%:  (FNS CL:MAKE-PATHNAME)
+(FILECREATED "14-Jan-2022 11:40:58" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>CMLPATHNAME.;2 41496  
 
-      previous date%: "22-Aug-90 19:16:14" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>CMLPATHNAME.;8|)
+      :PREVIOUS-DATE "28-Sep-90 15:14:19" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>CMLPATHNAME.;1)
 
 
 (* ; "
-Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1986-1988, 1990 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT CMLPATHNAMECOMS)
@@ -38,11 +39,12 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
               (FUNCTIONS INTERLISP-NAMESTRING UNPACKPATHNAME.STRING))
         (FUNCTIONS CL:FILE-NAMESTRING CL:DIRECTORY-NAMESTRING)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (%%INITIALIZE-DEFAULT-PATHNAME)))
-        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
-               (ADDVARS (NLAMA)
-                      (NLAML)
-                      (LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES 
-                            PATHNAME %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME])
+        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
+                                                                             (NLAML)
+                                                                             (LAMA 
+                                                                                 CL:ENOUGH-NAMESTRING
+                                                                                   CL:MERGE-PATHNAMES
+                                                                                   CL:MAKE-PATHNAME])
 
 
 
@@ -68,20 +70,20 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
 (DEFMACRO %%UNPACKFILE1 (NAM ST END FILE PACKFLG ONEFIELDFLG VAL)
    `[if (NOT ,ONEFIELDFLG)
         then [SETQ ,VAL (CONS (COND
-                                     (,PACKFLG (SUBATOM ,FILE ,ST ,END))
-                                     (T (OR (SUBSTRING ,FILE ,ST ,END)
-                                            "")))
-                                  (CONS ,NAM ,VAL]
+                                 (,PACKFLG (SUBATOM ,FILE ,ST ,END))
+                                 (T (OR (SUBSTRING ,FILE ,ST ,END)
+                                        "")))
+                              (CONS ,NAM ,VAL]
       elseif (EQMEMB ,NAM ,ONEFIELDFLG)
         then (RETURN (COND
-                            (,PACKFLG (SUBATOM ,FILE ,ST ,END))
-                            (T (OR (SUBSTRING ,FILE ,ST ,END)
-                                   ""])
+                        (,PACKFLG (SUBATOM ,FILE ,ST ,END))
+                        (T (OR (SUBSTRING ,FILE ,ST ,END)
+                               ""])
 
 (CL:DEFSTRUCT (PATHNAME (:CONC-NAME %%PATHNAME-)
-                            (:PRINT-FUNCTION %%PRINT-PATHNAME)
-                            (:CONSTRUCTOR %%%%MAKE-PATHNAME)
-                            (:PREDICATE CL:PATHNAMEP))
+                        (:PRINT-FUNCTION %%PRINT-PATHNAME)
+                        (:CONSTRUCTOR %%%%MAKE-PATHNAME)
+                        (:PREDICATE CL:PATHNAMEP))
    HOST
    DEVICE
    DIRECTORY
@@ -90,9 +92,9 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
    VERSION)
 
 (CL:DEFSTRUCT (DIRECTORY-COMPONENT (:CONC-NAME %%DIRECTORY-COMPONENT-)
-                                       (:PRINT-FUNCTION %%PRINT-DIRECTORY-COMPONENT)
-                                       (:CONSTRUCTOR %%MAKE-DIRECTORY-COMPONENT)
-                                       (:PREDICATE %%DIRECTORY-COMPONENT-P))
+                                   (:PRINT-FUNCTION %%PRINT-DIRECTORY-COMPONENT)
+                                   (:CONSTRUCTOR %%MAKE-DIRECTORY-COMPONENT)
+                                   (:PREDICATE %%DIRECTORY-COMPONENT-P))
    TYPE
    PATH)
 (DEFINEQ
@@ -252,9 +254,8 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
 (* ;;; "Returns the full form of PATHNAME as a string.")
 
    (CL:WHEN (AND (STREAMP PATHNAME)
-                 (NOT (fetch (STREAM NAMEDP) of PATHNAME)))
-                                                             (* ; 
-                                                   "unnamed streams have the empty string as name.")
+                 (NOT (fetch (STREAM NAMEDP) of PATHNAME)))  (* ; 
+                                                     "unnamed streams have the empty string as name.")
        (CL:RETURN-FROM CL:NAMESTRING ""))
    [LET* ((PATHNAME (PATHNAME PATHNAME))
           (CL::HOST (%%PATHNAME-HOST PATHNAME))
@@ -306,8 +307,8 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                                                 (T CL::VERSION))])])
 
 (CL:DEFUN CL:PARSE-NAMESTRING (THING &OPTIONAL HOST DEFAULTS &KEY (START 0)
-                                         END
-                                         (JUNK-ALLOWED NIL))
+                                     END
+                                     (JUNK-ALLOWED NIL))
 
 (* ;;; "Parses a string representation of a pathname into a pathname.  For details on the other silly arguments see the manual.  NOTE that this version ignores JUNK-ALLOWED (because UNPACKFILENAME a.k.a. PARSE-NAMESTRING1 will parse anything) It also ignores Host and defaults since we don't support non-standard hosts")
 
@@ -317,9 +318,9 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
        (PATHNAME (CL:RETURN-FROM CL:PARSE-NAMESTRING (CL:VALUES THING START)))
        (STREAM (CL:IF (XCL:SYNONYM-STREAM-P THING)
                    [CL:RETURN-FROM CL:PARSE-NAMESTRING (CL:PARSE-NAMESTRING (CL:SYMBOL-VALUE
-                                                                                 (
+                                                                             (
                                                                             XCL:SYNONYM-STREAM-SYMBOL
-                                                                                  THING]
+                                                                              THING]
                    (SETQ THING (FILE-NAME THING))))
        (CL:SYMBOL (SETQ THING (CL:SYMBOL-NAME THING)))
        (T (CL:ERROR "This is of an inappropriate type for parse-namestring: ~S" THING)))
@@ -339,8 +340,7 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                                    (CL:DIRECTORY (%%MAKE-DIRECTORY-COMPONENT :TYPE :DIRECTORY :PATH
                                                         (%%WILD-NAME CL:DIRECTORY)))
                                    (CL::SUBDIRECTORY (%%MAKE-DIRECTORY-COMPONENT :TYPE :SUBDIRECTORY
-                                                            :PATH (%%WILD-NAME CL::SUBDIRECTORY))
-                                          )
+                                                            :PATH (%%WILD-NAME CL::SUBDIRECTORY)))
                                    (CL::RELATIVEDIRECTORY (%%MAKE-DIRECTORY-COMPONENT :TYPE :RELATIVE
                                                                  :PATH (%%WILD-NAME 
                                                                               CL::RELATIVEDIRECTORY))
@@ -374,8 +374,8 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
             ((OR (LITATOM FILE)
                  (CL:STRINGP FILE)
                  (NUMBERP FILE)))
-            [(type? STREAM FILE)                         (* ; 
-                                               "For streams, use full name.  If anonymous, fake it")
+            [(type? STREAM FILE)                             (* ; 
+                                                 "For streams, use full name.  If anonymous, fake it")
              (SETQ FILE (OR (ffetch FULLFILENAME of FILE)
                             (RETURN (CONS (SUB1 POS)
                                           (LIST 'NAME FILE]
@@ -387,12 +387,12 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                                                 FILE 2)
                                          0))))
                   (%[                                        (* ; 
-                                                  "some Xerox and Arpanet systems use `[' for host")
+                                                    "some Xerox and Arpanet systems use `[' for host")
                       (SETQ TEM (SUB1 (OR (\UPF.NEXTPOS (CHARCODE "]")
                                                  FILE 2)
                                           0))))
                   (%(                                        (* ; 
-                                              "this is the standard for Xerox product file servers")
+                                                "this is the standard for Xerox product file servers")
                       (SETQ TEM (SUB1 (OR (\UPF.NEXTPOS (CHARCODE ")")
                                                  FILE 2)
                                           0))))
@@ -426,7 +426,7 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                                       [COND
                                          ((AND (EQ START POS)
                                                (NOT HOSTP))  (* ; 
-    "Didn't start with a directory delimiter, but it ends with one, so this must be a subdirectory")
+      "Didn't start with a directory delimiter, but it ends with one, so this must be a subdirectory")
                                           (SETQ TYPE 'SUBDIRECTORY]
                                       -2)
                                  (PROGN -1)))
@@ -435,12 +435,12 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                            (DREVERSE VAL]
             ((SELCHARQ (NTHCHARCODE FILE POS)
                   (/                                         (* ; 
-                                                "unix and the `xerox standard' use / for delimiter")
+                                                  "unix and the `xerox standard' use / for delimiter")
                      (SETQ TEM (LASTCHPOS (CHARCODE /)
                                       FILE
                                       (ADD1 POS))))
                   ((< >)                                     (* ; 
-             "Interlisp-D and most other Xerox systems, and Tops-20/Tenex use <>.  Jericho uses >>")
+               "Interlisp-D and most other Xerox systems, and Tops-20/Tenex use <>.  Jericho uses >>")
                        (SETQ TEM (LASTCHPOS (CHARCODE >)
                                         FILE
                                         (ADD1 POS))))
@@ -456,7 +456,7 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
      NAMELP
          (SELCHARQ CODE
               ((%. ! ; NIL)                                  (* ; 
-                                        "NAME and SUBDIRECTORY fields definitely terminated by now")
+                                          "NAME and SUBDIRECTORY fields definitely terminated by now")
                    (COND
                       ((AND (EQ CODE (CHARCODE %.))
                             (NOT BEYONDNAME)
@@ -475,29 +475,29 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
                              (COND
                                 ((AND (NULL CODE)
                                       (EQ POS TEM))          (* ; 
-                                      "Nothing follows the subdirectory;  null name is NOT implied")
+                                        "Nothing follows the subdirectory;  null name is NOT implied")
                                  (RETURN (CONS (SUB1 POS)
                                                (DREVERSE VAL]
                    (%%UNPACKFILE1 [COND
-                                         ((NOT BEYONDNAME)
-                                          (COND
-                                             ((NEQ CODE (CHARCODE %.))
-                                              (SETQQ BEYONDEXT ;)))
-                                          (SETQQ BEYONDNAME NAME))
-                                         ((NOT BEYONDEXT)
-                                          (SETQ BEYONDEXT (COND
-                                                             ((NEQ CODE (CHARCODE %.))
-                                                              ';)
-                                                             (T T)))
-                                          'TYPE)
-                                         (T (SELCHARQ (AND (EQ BEYONDEXT ';)
-                                                           (NTHCHARCODE FILE POS))
-                                                 (P 'PROTECTION)
-                                                 (A (add POS 1)
-                                                    'ACCOUNT)
-                                                 ((T S) 
-                                                      'TEMPORARY)
-                                                 'VERSION]
+                                     ((NOT BEYONDNAME)
+                                      (COND
+                                         ((NEQ CODE (CHARCODE %.))
+                                          (SETQQ BEYONDEXT ;)))
+                                      (SETQQ BEYONDNAME NAME))
+                                     ((NOT BEYONDEXT)
+                                      (SETQ BEYONDEXT (COND
+                                                         ((NEQ CODE (CHARCODE %.))
+                                                          ';)
+                                                         (T T)))
+                                      'TYPE)
+                                     (T (SELCHARQ (AND (EQ BEYONDEXT ';)
+                                                       (NTHCHARCODE FILE POS))
+                                             (P 'PROTECTION)
+                                             (A (add POS 1)
+                                                'ACCOUNT)
+                                             ((T S) 
+                                                  'TEMPORARY)
+                                             'VERSION]
                           POS
                           (SUB1 TEM)
                           FILE PACKFLG ONEFIELDFLG VAL)
@@ -509,12 +509,12 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
               (%'                                            (* ; "Quoter")
                   (add TEM 1))
               ((/ >)                                         (* ; 
-                                                           "Subdirectory terminating character")
+                                                             "Subdirectory terminating character")
                    (COND
                       ((AND (NOT HOSTP)
                             (NOT BEYONDNAME)
                             DIRFLG)                          (* ; 
-                                                           "Ok to treat this as a subdirectory")
+                                                             "Ok to treat this as a subdirectory")
                        (SETQ SUBDIREND TEM))))
               NIL)
      NEXTCHAR
@@ -527,14 +527,12 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
 
    [if (STREAMP PATHNAME)
        then (COND
-                   [(XCL:SYNONYM-STREAM-P PATHNAME)
-                    (CL:RETURN-FROM CL:TRUENAME (CL:TRUENAME (CL:SYMBOL-VALUE (
-                                                                            XCL:SYNONYM-STREAM-SYMBOL
-                                                                                   PATHNAME]
-                   ((NOT (fetch (STREAM NAMEDP) of PATHNAME))
-                                                             (* ; 
-       "let's catch this case, rather than have the message 'The file %"%" does not exist' appear.")
-                    (CL:ERROR "The stream ~S has no corresponding named file." PATHNAME]
+               [(XCL:SYNONYM-STREAM-P PATHNAME)
+                (CL:RETURN-FROM CL:TRUENAME (CL:TRUENAME (CL:SYMBOL-VALUE (XCL:SYNONYM-STREAM-SYMBOL
+                                                                           PATHNAME]
+               ((NOT (fetch (STREAM NAMEDP) of PATHNAME))    (* ; 
+         "let's catch this case, rather than have the message 'The file %"%" does not exist' appear.")
+                (CL:ERROR "The stream ~S has no corresponding named file." PATHNAME]
    (LET ((RESULT (CL:PROBE-FILE PATHNAME)))
         (CL:UNLESS RESULT
             (CL:ERROR "The file ~S does not exist." (CL:NAMESTRING PATHNAME)))
@@ -571,8 +569,9 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
    (DECLARE (GLOBALVARS *DEFAULT-PATHNAME-DEFAULTS* \CONNECTED.DIRECTORY))
    (if (NOT (BOUNDP '\CONNECTED.DIRECTORY))
        then (SETQ \CONNECTED.DIRECTORY '{DSK}))
-   [SETQ *DEFAULT-PATHNAME-DEFAULTS* (CL:PARSE-NAMESTRING \CONNECTED.DIRECTORY
-                                            (FILENAMEFIELD \CONNECTED.DIRECTORY 'HOST]
+   [SETQ *DEFAULT-PATHNAME-DEFAULTS* (CL:PARSE-NAMESTRING \CONNECTED.DIRECTORY (FILENAMEFIELD
+                                                                                \CONNECTED.DIRECTORY
+                                                                                'HOST]
    (CL:SETF (%%PATHNAME-VERSION *DEFAULT-PATHNAME-DEFAULTS*)
           :NEWEST)
    *DEFAULT-PATHNAME-DEFAULTS*)
@@ -599,53 +598,52 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
    (DECLARE (IGNORE DIRFLG))
    [if ONEFIELDFLG
        then [AND (CL:CONSP ONEFIELDFLG)
-                     (SETQ ONEFIELDFLG (CAR (CL:INTERSECTION ONEFIELDFLG
-                                                   '(HOST DEVICE DIRECTORY NAME EXTENSION VERSION]
-             (LET [(RESULT (CASE ONEFIELDFLG
-                               (HOST (CL:PATHNAME-HOST FILE))
-                               (DEVICE (CL:PATHNAME-DEVICE FILE))
-                               (DIRECTORY (CL:PATHNAME-DIRECTORY FILE))
-                               (NAME (CL:PATHNAME-NAME FILE))
-                               (EXTENSION (CL:PATHNAME-TYPE FILE))
-                               (VERSION (CL:PATHNAME-VERSION FILE))
-                               (CL:OTHERWISE NIL))]
-                  (if ATOMFLG
-                      then (MKATOM RESULT)
-                    else RESULT))
+                 (SETQ ONEFIELDFLG (CAR (CL:INTERSECTION ONEFIELDFLG
+                                               '(HOST DEVICE DIRECTORY NAME EXTENSION VERSION]
+            (LET [(RESULT (CASE ONEFIELDFLG
+                              (HOST (CL:PATHNAME-HOST FILE))
+                              (DEVICE (CL:PATHNAME-DEVICE FILE))
+                              (DIRECTORY (CL:PATHNAME-DIRECTORY FILE))
+                              (NAME (CL:PATHNAME-NAME FILE))
+                              (EXTENSION (CL:PATHNAME-TYPE FILE))
+                              (VERSION (CL:PATHNAME-VERSION FILE))
+                              (CL:OTHERWISE NIL))]
+                 (if ATOMFLG
+                     then (MKATOM RESULT)
+                   else RESULT))
      else (LET ((COMPONENT))
-                   (APPEND (if (SETQ COMPONENT (CL:PATHNAME-HOST FILE))
-                               then (LIST 'HOST (if ATOMFLG
-                                                        then (MKATOM COMPONENT)
-                                                      else COMPONENT)
-                                              COMPONENT))
-                          (if (SETQ COMPONENT (CL:PATHNAME-DEVICE FILE))
-                              then (LIST 'DEVICE (if ATOMFLG
-                                                         then (MKATOM COMPONENT)
-                                                       else COMPONENT)))
-                          (if (SETQ COMPONENT (CL:PATHNAME-DIRECTORY FILE))
-                              then (LIST 'DIRECTORY (if ATOMFLG
-                                                            then (MKATOM COMPONENT)
-                                                          else COMPONENT)))
-                          (if (SETQ COMPONENT (CL:PATHNAME-NAME FILE))
-                              then (LIST 'NAME (if ATOMFLG
-                                                       then (MKATOM COMPONENT)
-                                                     else COMPONENT)))
-                          (if (SETQ COMPONENT (CL:PATHNAME-TYPE FILE))
-                              then (LIST 'EXTENSION (if ATOMFLG
-                                                            then (MKATOM COMPONENT)
-                                                          else COMPONENT)))
-                          (if (SETQ COMPONENT (CL:PATHNAME-VERSION FILE))
-                              then (LIST 'VERSION (if ATOMFLG
-                                                          then (MKATOM COMPONENT)
-                                                        else (MKSTRING COMPONENT])
+               (APPEND (if (SETQ COMPONENT (CL:PATHNAME-HOST FILE))
+                           then (LIST 'HOST (if ATOMFLG
+                                                then (MKATOM COMPONENT)
+                                              else COMPONENT)
+                                      COMPONENT))
+                      (if (SETQ COMPONENT (CL:PATHNAME-DEVICE FILE))
+                          then (LIST 'DEVICE (if ATOMFLG
+                                                 then (MKATOM COMPONENT)
+                                               else COMPONENT)))
+                      (if (SETQ COMPONENT (CL:PATHNAME-DIRECTORY FILE))
+                          then (LIST 'DIRECTORY (if ATOMFLG
+                                                    then (MKATOM COMPONENT)
+                                                  else COMPONENT)))
+                      (if (SETQ COMPONENT (CL:PATHNAME-NAME FILE))
+                          then (LIST 'NAME (if ATOMFLG
+                                               then (MKATOM COMPONENT)
+                                             else COMPONENT)))
+                      (if (SETQ COMPONENT (CL:PATHNAME-TYPE FILE))
+                          then (LIST 'EXTENSION (if ATOMFLG
+                                                    then (MKATOM COMPONENT)
+                                                  else COMPONENT)))
+                      (if (SETQ COMPONENT (CL:PATHNAME-VERSION FILE))
+                          then (LIST 'VERSION (if ATOMFLG
+                                                  then (MKATOM COMPONENT)
+                                                else (MKSTRING COMPONENT])
 
 (CL:DEFUN CL:FILE-NAMESTRING (PATHNAME)
    (LET* ((*PRINT-BASE* 10)
           (*PRINT-RADIX* NIL)
           (PATH (PATHNAME PATHNAME))
-          [RESULT (CL:CONCATENATE 'CL:SIMPLE-STRING (MKSTRING (%%COMPONENT-STRING (
-                                                                                      %%PATHNAME-NAME
-                                                                                       PATH)))
+          [RESULT (CL:CONCATENATE 'CL:SIMPLE-STRING (MKSTRING (%%COMPONENT-STRING (%%PATHNAME-NAME
+                                                                                   PATH)))
                          "."
                          (MKSTRING (%%COMPONENT-STRING (%%PATHNAME-TYPE PATH]
           (VERSION (%%PATHNAME-VERSION PATH)))
@@ -675,8 +673,7 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
 
 (ADDTOVAR NLAML )
 
-(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES PATHNAME 
-                         %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME)
+(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:MERGE-PATHNAMES CL:MAKE-PATHNAME)
 )
 (PRETTYCOMPRINT CMLPATHNAMECOMS)
 
@@ -706,24 +703,33 @@ Copyright (c) 1986, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights r
               (FUNCTIONS INTERLISP-NAMESTRING UNPACKPATHNAME.STRING))
         (FUNCTIONS CL:FILE-NAMESTRING CL:DIRECTORY-NAMESTRING)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (%%INITIALIZE-DEFAULT-PATHNAME)))
-        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
-                                                                             (NLAML)
-                                                                             (LAMA 
-                                                                                 CL:ENOUGH-NAMESTRING
-                                                                                   CL:MERGE-PATHNAMES
-                                                                                   CL:MAKE-PATHNAME])
+        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
+               (ADDVARS (NLAMA)
+                      (NLAML)
+                      (LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES 
+                            PATHNAME %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME])
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
 (ADDTOVAR NLAMA )
 
 (ADDTOVAR NLAML )
 
-(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:MERGE-PATHNAMES CL:MAKE-PATHNAME)
+(ADDTOVAR LAMA CL:ENOUGH-NAMESTRING CL:HOST-NAMESTRING FILE-NAME CL:MERGE-PATHNAMES PATHNAME 
+                     %%PRINT-DIRECTORY-COMPONENT CL:MAKE-PATHNAME %%PRINT-PATHNAME)
 )
 (PUTPROPS CMLPATHNAME COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3597 9368 (%%PRINT-PATHNAME 3607 . 3768) (CL:MAKE-PATHNAME 3770 . 8520) (
-%%PRINT-DIRECTORY-COMPONENT 8522 . 9366)) (10569 15893 (PATHNAME 10579 . 10771) (CL:MERGE-PATHNAMES 
-10773 . 12859) (FILE-NAME 12861 . 13002) (CL:HOST-NAMESTRING 13004 . 13193) (CL:ENOUGH-NAMESTRING 
-13195 . 15660) (%%NUMERIC-STRING-P 15662 . 15891)))))
+  (FILEMAP (NIL (3743 9514 (%%PRINT-PATHNAME 3753 . 3914) (CL:MAKE-PATHNAME 3916 . 8666) (
+%%PRINT-DIRECTORY-COMPONENT 8668 . 9512)) (9516 9709 (CL:PATHNAME-HOST 9516 . 9709)) (9711 9910 (
+CL:PATHNAME-DEVICE 9711 . 9910)) (9912 10120 (CL:PATHNAME-DIRECTORY 9912 . 10120)) (10122 10315 (
+CL:PATHNAME-NAME 10122 . 10315)) (10317 10510 (CL:PATHNAME-TYPE 10317 . 10510)) (10512 10714 (
+CL:PATHNAME-VERSION 10512 . 10714)) (10715 16039 (PATHNAME 10725 . 10917) (CL:MERGE-PATHNAMES 10919 . 
+13005) (FILE-NAME 13007 . 13148) (CL:HOST-NAMESTRING 13150 . 13339) (CL:ENOUGH-NAMESTRING 13341 . 
+15806) (%%NUMERIC-STRING-P 15808 . 16037)) (16041 19794 (CL:NAMESTRING 16041 . 19794)) (19796 23267 (
+CL:PARSE-NAMESTRING 19796 . 23267)) (23269 31722 (PARSE-NAMESTRING1 23269 . 31722)) (31724 32727 (
+CL:TRUENAME 31724 . 32727)) (32729 32921 (%%MAKE-PATHNAME 32729 . 32921)) (32923 33560 (
+%%PATHNAME-EQUAL 32923 . 33560)) (33562 34019 (%%DIRECTORY-COMPONENT-EQUAL 33562 . 34019)) (34021 
+34644 (%%INITIALIZE-DEFAULT-PATHNAME 34021 . 34644)) (34734 34901 (INTERLISP-NAMESTRING 34734 . 34901)
+) (34903 37796 (UNPACKPATHNAME.STRING 34903 . 37796)) (37798 39055 (CL:FILE-NAMESTRING 37798 . 39055))
+ (39057 39255 (CL:DIRECTORY-NAMESTRING 39057 . 39255)))))
 STOP
diff --git a/sources/CMLPATHNAME.LCOM b/sources/CMLPATHNAME.LCOM
index 58630923..28c012ea 100644
Binary files a/sources/CMLPATHNAME.LCOM and b/sources/CMLPATHNAME.LCOM differ
