diff --git a/sources/ATBL b/sources/ATBL
index b8edac7d..86d4db20 100644
--- a/sources/ATBL
+++ b/sources/ATBL
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "24-Apr-2025 21:52:35" {WMEDLEY}<sources>ATBL.;33 91754  
+(FILECREATED "25-Feb-2026 12:02:51" {WMEDLEY}<sources>ATBL.;35 92262  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS \ATBLSET EQUAL-READER-ENVIRONMENT)
+      :CHANGES-TO (VARS ATBLCOMS)
 
-      :PREVIOUS-DATE "26-Dec-2021 14:32:50" {WMEDLEY}<sources>ATBL.;32)
+      :PREVIOUS-DATE "24-Apr-2025 21:52:35" {WMEDLEY}<sources>ATBL.;33)
 
 
 (PRETTYCOMPRINT ATBLCOMS)
@@ -56,12 +56,13 @@
                             (CONSTANTS * READCLASSES)
                             (CONSTANTS * READMACROWAKEUPS)
                             (CONSTANTS * READMACROESCAPES)
-                            (RECORDS READCODE READMACRODEF READTABLEP))
+                            (RECORDS READCODE READMACRODEF READTABLEP)
+                            (RECORDS READER-ENVIRONMENT))
                      (GLOBALVARS \ORIGREADTABLE \READTABLEHASH \ORIGTERMTABLE))
-              (INITRECORDS READTABLEP))
+              (INITRECORDS READTABLEP)
+              (INITRECORDS READER-ENVIRONMENT))
         [COMS (INITVARS (\READTABLEHASH))
               (FNS \ATBLSET)
-              (INITRECORDS READER-ENVIRONMENT)
                                                              (* ; 
               "Definition is on CMLREAD, need it here to initialize *OLD-INTERLISP-READ-ENVIRONMENT*")
               (FNS MAKE-READER-ENVIRONMENT EQUAL-READER-ENVIRONMENT SET-READER-ENVIRONMENT)
@@ -1691,6 +1692,19 @@
          (READTABLEP 8 (BITS . 7))
          (READTABLEP 10 POINTER))
        '12)
+(DECLARE%: EVAL@COMPILE
+
+(DATATYPE READER-ENVIRONMENT (REPACKAGE REREADTABLE REBASE REPACKAGEFORM REFORMAT REREADTABLEFORM))
+)
+
+(/DECLAREDATATYPE 'READER-ENVIRONMENT '(POINTER POINTER POINTER POINTER POINTER POINTER)
+       '((READER-ENVIRONMENT 0 POINTER)
+         (READER-ENVIRONMENT 2 POINTER)
+         (READER-ENVIRONMENT 4 POINTER)
+         (READER-ENVIRONMENT 6 POINTER)
+         (READER-ENVIRONMENT 8 POINTER)
+         (READER-ENVIRONMENT 10 POINTER))
+       '12)
 
 (* "END EXPORTED DEFINITIONS")
 
@@ -1726,6 +1740,15 @@
          (READTABLEP 10 POINTER))
        '12)
 
+(/DECLAREDATATYPE 'READER-ENVIRONMENT '(POINTER POINTER POINTER POINTER POINTER POINTER)
+       '((READER-ENVIRONMENT 0 POINTER)
+         (READER-ENVIRONMENT 2 POINTER)
+         (READER-ENVIRONMENT 4 POINTER)
+         (READER-ENVIRONMENT 6 POINTER)
+         (READER-ENVIRONMENT 8 POINTER)
+         (READER-ENVIRONMENT 10 POINTER))
+       '12)
+
 (RPAQ? \READTABLEHASH )
 (DEFINEQ
 
@@ -1813,15 +1836,6 @@
         NIL])
 )
 
-(/DECLAREDATATYPE 'READER-ENVIRONMENT '(POINTER POINTER POINTER POINTER POINTER POINTER)
-       '((READER-ENVIRONMENT 0 POINTER)
-         (READER-ENVIRONMENT 2 POINTER)
-         (READER-ENVIRONMENT 4 POINTER)
-         (READER-ENVIRONMENT 6 POINTER)
-         (READER-ENVIRONMENT 8 POINTER)
-         (READER-ENVIRONMENT 10 POINTER))
-       '12)
-
 
 
 (* ; "Definition is on CMLREAD, need it here to initialize *OLD-INTERLISP-READ-ENVIRONMENT*")
@@ -1922,22 +1936,22 @@
 (ADDTOVAR LAMA READTABLEPROP)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (17619 28771 (GETSYNTAX 17629 . 22460) (SETSYNTAX 22462 . 23535) (SYNTAXP 23537 . 26034)
- (\COPYSYNTAX 26036 . 26753) (\GETCHARCODE 26755 . 27043) (\SETFATSYNCODE 27045 . 28336) (
-\MAPCHARTABLE 28338 . 28769)) (28804 43770 (CONTROL 28814 . 29066) (COPYTERMTABLE 29068 . 29435) (
-DELETECONTROL 29437 . 32078) (GETDELETECONTROL 32080 . 33042) (ECHOCHAR 33044 . 34485) (ECHOCONTROL 
-34487 . 34944) (ECHOMODE 34946 . 35192) (GETECHOMODE 35194 . 35358) (GETCONTROL 35360 . 35526) (
-GETTERMTABLE 35528 . 35595) (RAISE 35597 . 36023) (GETRAISE 36025 . 36187) (RESETTERMTABLE 36189 . 
-37273) (SETTERMTABLE 37275 . 37509) (TERMTABLEP 37511 . 37672) (\GETTERMSYNTAX 37674 . 37945) (
-\GTTERMTABLE 37947 . 38283) (\ORIGTERMTABLE 38285 . 41895) (\SETTERMSYNTAX 41897 . 42532) (
-\TERMCLASSTOCODE 42534 . 42963) (\TERMCODETOCLASS 42965 . 43352) (\LITCHECK 43354 . 43768)) (46281 
-70105 (COPYREADTABLE 46291 . 46489) (FIND-READTABLE 46491 . 46638) (IN-READTABLE 46640 . 46800) (
-ESCAPE 46802 . 47055) (GETBRK 47057 . 47195) (GETREADTABLE 47197 . 47333) (GETSEPR 47335 . 47473) (
-READMACROS 47475 . 47738) (READTABLEP 47740 . 47903) (READTABLEPROP 47905 . 53063) (RESETREADTABLE 
-53065 . 57312) (SETBRK 57314 . 58924) (SETREADTABLE 58926 . 59114) (SETSEPR 59116 . 60658) (
-\GETREADSYNTAX 60660 . 63350) (\GTREADTABLE 63352 . 63577) (\GTREADTABLE1 63579 . 63835) (
-\ORIGREADTABLE 63837 . 65745) (\READCLASSTOCODE 65747 . 66198) (\SETMACROSYNTAX 66200 . 67995) (
-\SETREADSYNTAX 67997 . 69058) (\READTABLEP.DEFPRINT 69060 . 70103)) (82937 87494 (\ATBLSET 82947 . 
-87492)) (87941 91385 (MAKE-READER-ENVIRONMENT 87951 . 89608) (EQUAL-READER-ENVIRONMENT 89610 . 90787) 
-(SET-READER-ENVIRONMENT 90789 . 91383)))))
+  (FILEMAP (NIL (17652 28804 (GETSYNTAX 17662 . 22493) (SETSYNTAX 22495 . 23568) (SYNTAXP 23570 . 26067)
+ (\COPYSYNTAX 26069 . 26786) (\GETCHARCODE 26788 . 27076) (\SETFATSYNCODE 27078 . 28369) (
+\MAPCHARTABLE 28371 . 28802)) (28837 43803 (CONTROL 28847 . 29099) (COPYTERMTABLE 29101 . 29468) (
+DELETECONTROL 29470 . 32111) (GETDELETECONTROL 32113 . 33075) (ECHOCHAR 33077 . 34518) (ECHOCONTROL 
+34520 . 34977) (ECHOMODE 34979 . 35225) (GETECHOMODE 35227 . 35391) (GETCONTROL 35393 . 35559) (
+GETTERMTABLE 35561 . 35628) (RAISE 35630 . 36056) (GETRAISE 36058 . 36220) (RESETTERMTABLE 36222 . 
+37306) (SETTERMTABLE 37308 . 37542) (TERMTABLEP 37544 . 37705) (\GETTERMSYNTAX 37707 . 37978) (
+\GTTERMTABLE 37980 . 38316) (\ORIGTERMTABLE 38318 . 41928) (\SETTERMSYNTAX 41930 . 42565) (
+\TERMCLASSTOCODE 42567 . 42996) (\TERMCODETOCLASS 42998 . 43385) (\LITCHECK 43387 . 43801)) (46314 
+70138 (COPYREADTABLE 46324 . 46522) (FIND-READTABLE 46524 . 46671) (IN-READTABLE 46673 . 46833) (
+ESCAPE 46835 . 47088) (GETBRK 47090 . 47228) (GETREADTABLE 47230 . 47366) (GETSEPR 47368 . 47506) (
+READMACROS 47508 . 47771) (READTABLEP 47773 . 47936) (READTABLEPROP 47938 . 53096) (RESETREADTABLE 
+53098 . 57345) (SETBRK 57347 . 58957) (SETREADTABLE 58959 . 59147) (SETSEPR 59149 . 60691) (
+\GETREADSYNTAX 60693 . 63383) (\GTREADTABLE 63385 . 63610) (\GTREADTABLE1 63612 . 63868) (
+\ORIGREADTABLE 63870 . 65778) (\READCLASSTOCODE 65780 . 66231) (\SETMACROSYNTAX 66233 . 68028) (
+\SETREADSYNTAX 68030 . 69091) (\READTABLEP.DEFPRINT 69093 . 70136)) (83789 88346 (\ATBLSET 83799 . 
+88344)) (88449 91893 (MAKE-READER-ENVIRONMENT 88459 . 90116) (EQUAL-READER-ENVIRONMENT 90118 . 91295) 
+(SET-READER-ENVIRONMENT 91297 . 91891)))))
 STOP
diff --git a/sources/ATBL.LCOM b/sources/ATBL.LCOM
index 0ca35895..21f08bb3 100644
Binary files a/sources/ATBL.LCOM and b/sources/ATBL.LCOM differ
diff --git a/sources/CMLREAD b/sources/CMLREAD
index 2542b14f..81c044d3 100644
--- a/sources/CMLREAD
+++ b/sources/CMLREAD
@@ -1,12 +1,13 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT UTF-8)
 
-(FILECREATED "24-Apr-2025 21:59:48" {WMEDLEY}<sources>CMLREAD.;17 12829  
+(FILECREATED "25-Feb-2026 11:51:19" {WMEDLEY}<sources>CMLREAD.;24 12180  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (VARS CMLREADCOMS)
+                  (FUNCTIONS WITH-READER-ENVIRONMENT)
 
-      :PREVIOUS-DATE "23-Sep-2024 11:55:33" {WMEDLEY}<sources>CMLREAD.;16)
+      :PREVIOUS-DATE "25-Feb-2026 09:25:29" {WMEDLEY}<sources>CMLREAD.;21)
 
 
 (PRETTYCOMPRINT CMLREADCOMS)
@@ -26,18 +27,14 @@
                     (DWIMINMACROSFLG))
               (VARIABLES *READ-DEFAULT-FLOAT-FORMAT*)
               (GLOBALVARS CMLRDTBL READ-LINE-RDTBL))
-        [COMS 
-              (* ;; "Crude means to aid reading and printing things in same reader environment.  There are some fns and an INITRECORDS for this on ATBL to get it early in the loadup")
-
-              (RECORDS READER-ENVIRONMENT)
-              (FUNCTIONS WITH-READER-ENVIRONMENT)
-              (ADDVARS (SYSSPECVARS *PACKAGE* *READTABLE* *READ-BASE* *PRINT-BASE*))
+        [COMS (FUNCTIONS WITH-READER-ENVIRONMENT)
               (PROP INFO WITH-READER-ENVIRONMENT)
+              (ADDVARS (SYSSPECVARS *PACKAGE* *READTABLE* *READ-BASE* *PRINT-BASE*))
               (GLOBALVARS *COMMON-LISP-READ-ENVIRONMENT*)
-              (INITVARS (*COMMON-LISP-READ-ENVIRONMENT* (create READER-ENVIRONMENT REPACKAGE _
+              (INITVARS (*COMMON-LISP-READ-ENVIRONMENT* (create READER-ENVIRONMENT REPACKAGE ←
                                                                (CL:FIND-PACKAGE "USER")
-                                                               REREADTABLE _ CMLRDTBL REBASE _ 10 
-                                                               REFORMAT _ :MCCS]
+                                                               REREADTABLE ← CMLRDTBL REBASE ← 10 
+                                                               REFORMAT ← :MCCS]
         (PROP FILETYPE CMLREAD)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
                (ADDVARS (NLAMA)
@@ -53,48 +50,48 @@
 
 (CL:COPY-READTABLE
   [CL:LAMBDA (&OPTIONAL (FROM-READTABLE *READTABLE*)
-                    TO-READTABLE)                        (* bvm%: "13-Oct-86 15:21")
+                    TO-READTABLE)                            (* bvm%: "13-Oct-86 15:21")
                                                              (* ; 
-               "If FROM-READTABLE is NIL, then a copy of a standard Common Lisp readtable is made.")
+                 "If FROM-READTABLE is NIL, then a copy of a standard Common Lisp readtable is made.")
          (if (AND (NULL FROM-READTABLE)
-                      (NULL TO-READTABLE))
-             then                                        (* ; "just make a brand new one")
-                   (CMLRDTBL)
+                  (NULL TO-READTABLE))
+             then                                            (* ; "just make a brand new one")
+                  (CMLRDTBL)
            else (SETQ FROM-READTABLE (\DTEST (OR FROM-READTABLE (CMLRDTBL))
-                                                'READTABLEP))
-                 (if TO-READTABLE
-                     then (RESETREADTABLE (\DTEST TO-READTABLE 'READTABLEP)
-                                     FROM-READTABLE)
-                           TO-READTABLE
-                   else (COPYREADTABLE FROM-READTABLE])
+                                            'READTABLEP))
+                (if TO-READTABLE
+                    then (RESETREADTABLE (\DTEST TO-READTABLE 'READTABLEP)
+                                FROM-READTABLE)
+                         TO-READTABLE
+                  else (COPYREADTABLE FROM-READTABLE])
 )
 (DEFINEQ
 
 (CL:READ-LINE
   [CL:LAMBDA (&OPTIONAL STREAM (EOF-ERRORP T)
-                    EOF-VALUE RECURSIVE-P)               (* ; "Edited 31-Mar-87 18:36 by bvm:")
+                    EOF-VALUE RECURSIVE-P)                   (* ; "Edited 31-Mar-87 18:36 by bvm:")
 
          (* ;; 
-       "Returns a line of text read from the STREAM as a string, discarding the newline character.")
+         "Returns a line of text read from the STREAM as a string, discarding the newline character.")
 
          (CL:SETQ STREAM (\GETSTREAM STREAM 'INPUT))
          (if (AND (NULL EOF-ERRORP)
-                      (NULL RECURSIVE-P)
-                      (\EOFP STREAM))
+                  (NULL RECURSIVE-P)
+                  (\EOFP STREAM))
              then EOF-VALUE
            else (LET ((RESULT (RSTRING STREAM READ-LINE-RDTBL)))
-                         (if (\EOFP STREAM)
-                             then (CL:VALUES RESULT T)
-                           else                          (* ; "consume the eol")
-                                 (READCCODE STREAM)
-                                 (CL:VALUES RESULT NIL])
+                     (if (\EOFP STREAM)
+                         then (CL:VALUES RESULT T)
+                       else                                  (* ; "consume the eol")
+                            (READCCODE STREAM)
+                            (CL:VALUES RESULT NIL])
 
 (CL:READ-CHAR
   [CL:LAMBDA (&OPTIONAL (STREAM *STANDARD-INPUT*)
                     (EOF-ERRORP T)
-                    EOF-VALUE RECURSIVE-P)               (* ; "Edited 14-Dec-86 20:41 by bvm:")
+                    EOF-VALUE RECURSIVE-P)                   (* ; "Edited 14-Dec-86 20:41 by bvm:")
 
-         (* ;; "Inputs a character from STREAM and returns it.")
+         (* ;; "Inputs a character from STREAM and returns it.")
 
          (LET [(STREAM (\GETSTREAM STREAM 'INPUT]
               (COND
@@ -105,10 +102,10 @@
                  (T (CL:CODE-CHAR (READCCODE STREAM])
 
 (CL:UNREAD-CHAR
-  (CL:LAMBDA (CHARACTER &OPTIONAL (INPUT-STREAM *STANDARD-INPUT*))
-                                                            (* ; "Edited 23-Jun-2021 13:05 by rmk:")
+  (CL:LAMBDA (CHARACTER &OPTIONAL (INPUT-STREAM *STANDARD-INPUT*))
+                                                            (* ; "Edited 23-Jun-2021 13:05 by rmk:")
 
-         (* ;; "Puts the CHARACTER back on the front of the input STREAM.  According to the manual, `One may apply UNREAD-CHAR only to the character most recently read from INPUT-STREAM.'")
+         (* ;; "Puts the CHARACTER back on the front of the input STREAM.  According to the manual, `One may apply UNREAD-CHAR only to the character most recently read from INPUT-STREAM.'")
 
          (\BACKCCODE (\GETSTREAM INPUT-STREAM 'INPUT))
          NIL))
@@ -153,7 +150,7 @@
                     else (\ILLEGAL.ARG PEEK-TYPE])
 
 (CL:LISTEN
-  (CL:LAMBDA (&OPTIONAL STREAM)                          (* ; "Edited 14-Apr-87 16:49 by bvm:")
+  (CL:LAMBDA (&OPTIONAL STREAM)                              (* ; "Edited 14-Apr-87 16:49 by bvm:")
 
          (* ;; "Returns T if a character is available on the given STREAM ")
 
@@ -162,7 +159,7 @@
 
 (CL:READ-CHAR-NO-HANG
   (CL:LAMBDA (&OPTIONAL STREAM (EOF-ERRORP T)
-                    EOF-VALUE RECURSIVE-P)               (* ; "Edited 14-Apr-87 16:40 by bvm:")
+                    EOF-VALUE RECURSIVE-P)                   (* ; "Edited 14-Apr-87 16:40 by bvm:")
 
          (* ;; "Returns the next character from the STREAM if one is available, or NIL.  However, if STREAM is at eof, do eof handling.")
 
@@ -170,13 +167,13 @@
             ((READP STREAM T)                                (* ; "there is input, get it")
              (CL:READ-CHAR STREAM EOF-ERRORP EOF-VALUE RECURSIVE-P))
             ((NOT (EOFP STREAM))                             (* ; 
-                                             "there could be more input, so don't wait, return NIL")
+                                               "there could be more input, so don't wait, return NIL")
              NIL)
             (EOF-ERRORP (\EOF.ACTION STREAM))
             (T EOF-VALUE))))
 
 (CL:CLEAR-INPUT
-  [CL:LAMBDA (&OPTIONAL (STREAM *STANDARD-INPUT*))       (* bvm%: "13-Oct-86 15:46")
+  [CL:LAMBDA (&OPTIONAL (STREAM *STANDARD-INPUT*))           (* bvm%: "13-Oct-86 15:46")
 
          (* ;; "Clears any buffered input associated with the Stream.")
 
@@ -200,7 +197,7 @@
 
 (CL:READ-BYTE
   [CL:LAMBDA (BINARY-INPUT-STREAM &OPTIONAL (EOF-ERRORP T)
-                    EOF-VALUE)                           (* bvm%: "13-Oct-86 15:49")
+                    EOF-VALUE)                               (* bvm%: "13-Oct-86 15:49")
 
          (* ;; "Returns the next byte of the BINARY-INPUT-STREAM")
 
@@ -211,7 +208,7 @@
                   (\BIN STREAM))])
 
 (CL:WRITE-BYTE
-  (CL:LAMBDA (INTEGER BINARY-OUTPUT-STREAM)              (* bvm%: "13-Oct-86 15:49")
+  (CL:LAMBDA (INTEGER BINARY-OUTPUT-STREAM)                  (* bvm%: "13-Oct-86 15:49")
 
          (* ;; "Outputs the INTEGER to the binary BINARY-OUTPUT-STREAM")
 
@@ -236,47 +233,30 @@
 (GLOBALVARS CMLRDTBL READ-LINE-RDTBL)
 )
 
-
-
-(* ;; 
-"Crude means to aid reading and printing things in same reader environment.  There are some fns and an INITRECORDS for this on ATBL to get it early in the loadup"
-)
-
-(DECLARE%: EVAL@COMPILE
-
-(DATATYPE READER-ENVIRONMENT (REPACKAGE REREADTABLE REBASE REPACKAGEFORM REFORMAT REREADTABLEFORM))
-)
-
-(/DECLAREDATATYPE 'READER-ENVIRONMENT '(POINTER POINTER POINTER POINTER POINTER POINTER)
-       '((READER-ENVIRONMENT 0 POINTER)
-         (READER-ENVIRONMENT 2 POINTER)
-         (READER-ENVIRONMENT 4 POINTER)
-         (READER-ENVIRONMENT 6 POINTER)
-         (READER-ENVIRONMENT 8 POINTER)
-         (READER-ENVIRONMENT 10 POINTER))
-       '12)
-
-(DEFMACRO WITH-READER-ENVIRONMENT (ENV . BODY)
+(DEFMACRO WITH-READER-ENVIRONMENT (ENV . BODY)               (* ; "Edited 25-Feb-2026 09:23 by rmk")
    `((CL:LAMBDA (E)
+            (CL:WHEN (\GETSTREAM E 'INPUT T)
+                (SETQ E (READ-READER-ENVIRONMENT STREAM)))
+            (\DTEST E 'READER-ENVIRONMENT)
             (LET ((*PACKAGE* (ffetch (READER-ENVIRONMENT REPACKAGE) of E))
                   (*READTABLE* (ffetch (READER-ENVIRONMENT REREADTABLE) of E))
                   (*READ-BASE* (ffetch (READER-ENVIRONMENT REBASE) of E))
                   (*PRINT-BASE* (ffetch (READER-ENVIRONMENT REBASE) of E)))
                  ,@BODY))
-     (\DTEST ,ENV 'READER-ENVIRONMENT)))
-
-(ADDTOVAR SYSSPECVARS *PACKAGE* *READTABLE* *READ-BASE* *PRINT-BASE*)
+     ,ENV))
 
 (PUTPROPS WITH-READER-ENVIRONMENT INFO EVAL)
+
+(ADDTOVAR SYSSPECVARS *PACKAGE* *READTABLE* *READ-BASE* *PRINT-BASE*)
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS *COMMON-LISP-READ-ENVIRONMENT*)
 )
 
-(RPAQ? *COMMON-LISP-READ-ENVIRONMENT* (create READER-ENVIRONMENT REPACKAGE _ (CL:FIND-PACKAGE "USER")
-                                             REREADTABLE _ CMLRDTBL REBASE _ 10 REFORMAT _ :MCCS))
+(RPAQ? *COMMON-LISP-READ-ENVIRONMENT* (create READER-ENVIRONMENT REPACKAGE ← (CL:FIND-PACKAGE "USER")
+                                             REREADTABLE ← CMLRDTBL REBASE ← 10 REFORMAT ← :MCCS))
 
-(PUTPROPS CMLREAD FILETYPE CL:COMPILE-FILE)
+(PUTPROPS CMLREAD FILETYPE :FAKE-COMPILE-FILE)
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
 (ADDTOVAR NLAMA )
@@ -287,9 +267,9 @@
                      CL:UNREAD-CHAR CL:READ-CHAR CL:READ-LINE CL:COPY-READTABLE)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2380 3365 (CL:COPY-READTABLE 2390 . 3363)) (3366 10574 (CL:READ-LINE 3376 . 4248) (
-CL:READ-CHAR 4250 . 4800) (CL:UNREAD-CHAR 4802 . 5263) (CL:PEEK-CHAR 5265 . 7559) (CL:LISTEN 7561 . 
-7826) (CL:READ-CHAR-NO-HANG 7828 . 8600) (CL:CLEAR-INPUT 8602 . 8839) (CL:READ-FROM-STRING 8841 . 9861
-) (CL:READ-BYTE 9863 . 10316) (CL:WRITE-BYTE 10318 . 10572)) (11568 12041 (WITH-READER-ENVIRONMENT 
-11568 . 12041)))))
+  (FILEMAP (NIL (2210 3182 (CL:COPY-READTABLE 2220 . 3180)) (3183 10389 (CL:READ-LINE 3193 . 4049) (
+CL:READ-CHAR 4051 . 4605) (CL:UNREAD-CHAR 4607 . 5068) (CL:PEEK-CHAR 5070 . 7364) (CL:LISTEN 7366 . 
+7635) (CL:READ-CHAR-NO-HANG 7637 . 8415) (CL:CLEAR-INPUT 8417 . 8654) (CL:READ-FROM-STRING 8656 . 9676
+) (CL:READ-BYTE 9678 . 10131) (CL:WRITE-BYTE 10133 . 10387)) (10728 11381 (WITH-READER-ENVIRONMENT 
+10728 . 11381)))))
 STOP
diff --git a/sources/CMLREAD.LCOM b/sources/CMLREAD.LCOM
index d2e4be96..6c590305 100644
Binary files a/sources/CMLREAD.LCOM and b/sources/CMLREAD.LCOM differ
diff --git a/sources/FILEPKG b/sources/FILEPKG
index ca8c5132..46d6906b 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "23-Feb-2026 00:54:21" {WMEDLEY}<sources>FILEPKG.;59 275343 
+(FILECREATED "25-Feb-2026 10:07:03" {WMEDLEY}<sources>FILEPKG.;61 275774 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS IMPORTFILESCAN FILEGETDEF.FNS GETDEFCURRENT)
+      :CHANGES-TO (FNS FILEGETDEF.FNS)
 
-      :PREVIOUS-DATE "22-Feb-2026 18:02:21" {WMEDLEY}<sources>FILEPKG.;56)
+      :PREVIOUS-DATE "23-Feb-2026 00:54:21" {WMEDLEY}<sources>FILEPKG.;59)
 
 
 (PRETTYCOMPRINT FILEPKGCOMS)
@@ -2908,7 +2908,8 @@ compiling " T)
                                                        NIL) finally (RETURN 'NOBIND])
 
 (FILEGETDEF.FNS
-  [LAMBDA (NAME TYPE SOURCE OPTIONS)                         (* ; "Edited 23-Feb-2026 00:37 by rmk")
+  [LAMBDA (NAME TYPE SOURCE OPTIONS)                         (* ; "Edited 25-Feb-2026 10:06 by rmk")
+                                                             (* ; "Edited 23-Feb-2026 00:37 by rmk")
                                                              (* bvm%: "29-Aug-86 22:30")
     (LET (MAP ENV)
          (COND
@@ -2930,7 +2931,12 @@ compiling " T)
                                    (LIST (READ SOURCE)
                                          (READ SOURCE)))
                                   (T (CADR (READ SOURCE])]
-            (T (CADR (FASSOC NAME (LOADEFS NAME SOURCE])
+            (T 
+               (* ;; "RMK:  The NLSETQ is because LOADFNS for FNS seems to disregard NOERROR and crash out when the target is FUNCTIONS, like WITH-READER-ENVIRONMENT")
+
+               (CADR (FASSOC NAME (CL:IF (EQMEMB 'NOERROR OPTIONS)
+                                      [CAR (NLSETQ (LOADFNS NAME SOURCE 'GETDEF]
+                                      (LOADFNS NAME SOURCE 'GETDEF))])
 
 (FILEPKGCOMS.PUTDEF
   [LAMBDA (NAME TYPE DEFINITION REASON)                      (* lmm "15-Jul-85 11:29")
@@ -3043,14 +3049,14 @@ compiling " T)
 
 
 (ADDTOVAR USERMACROS
+          (M NIL (MAKE FILE FILE))
           (M (X . Y)
              (E (MARKASCHANGED (COND ((LISTP 'X)
                                       (CAR 'X))
                                      (T 'X))
                        'USERMACROS)
                 T)
-             (ORIGINAL (M X . Y)))
-          (M NIL (MAKE FILE FILE)))
+             (ORIGINAL (M X . Y))))
 
 (ADDTOVAR EDITMACROS
           (M (X . Y)
@@ -4872,46 +4878,46 @@ compiling " T)
 (ADDTOVAR LAMA FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18922 20595 (SEARCHPRETTYTYPELST 18932 . 19901) (PRETTYDEFMACROS 19903 . 20339) (
-FILEPKGCOMPROPS 20341 . 20593)) (21408 55807 (CLEANUP 21418 . 22808) (COMPILEFILES 22810 . 23086) (
-COMPILEFILES0 23088 . 23901) (CONTINUEDIT 23903 . 25280) (MAKEFILE 25282 . 37008) (FILECHANGES 37010
- . 39774) (FILEPKG.MERGECHANGES 39776 . 40411) (FILEPKG.CHANGEDFNS 40413 . 40725) (MAKEFILE1 40727 . 
-44939) (COMPILE-FILE? 44941 . 46635) (MAKEFILES 46637 . 48165) (ADDFILE 48167 . 50710) (ADDFILE0 50712
- . 54836) (LISTFILES 54838 . 55805)) (56479 90278 (FILEPKGCHANGES 56489 . 57668) (GETFILEPKGTYPE 57670
- . 60620) (MARKASCHANGED 60622 . 62253) (FILECOMS 62255 . 62639) (WHEREIS 62641 . 64383) (
-SMASHFILECOMS 64385 . 64613) (FILEFNSLST 64615 . 64781) (FILECOMSLST 64783 . 65269) (UPDATEFILES 65271
- . 69769) (INFILECOMS? 69771 . 71614) (INFILECOMTAIL 71616 . 72734) (INFILECOMS 72736 . 72897) (
-INFILECOM 72899 . 82917) (INFILECOMSVALS 82919 . 83226) (INFILECOMSVAL 83228 . 84236) (INFILECOMSPROP 
-84238 . 85031) (IFCPROPS 85033 . 86113) (IFCEXPRTYPE 86115 . 86731) (IFCPROPSCAN 86733 . 87694) (
-IFCDECLARE 87696 . 88955) (INFILEPAIRS 88957 . 89256) (INFILECOMSMACRO 89258 . 90276)) (90313 120999 (
-FILES? 90323 . 92434) (FILES?1 92436 . 93138) (FILES?PRINTLST 93140 . 93922) (ADDTOFILES? 93924 . 
-104467) (ADDTOFILE 104469 . 105385) (WHATIS 105387 . 107363) (ADDTOCOMS 107365 . 108903) (ADDTOCOM 
-108905 . 115392) (ADDTOCOM1 115394 . 116565) (ADDNEWCOM 116567 . 117617) (MAKENEWCOM 117619 . 119466) 
-(DEFAULTMAKENEWCOM 119468 . 120997)) (121069 123886 (MERGEINSERT 121079 . 123422) (MERGEINSERT1 123424
- . 123884)) (124040 125401 (ADDTOFILEKEYLST 124050 . 125399)) (125518 136319 (DELFROMFILES 125528 . 
-126358) (DELFROMCOMS 126360 . 128039) (DELFROMCOM 128041 . 133806) (DELFROMCOM1 133808 . 134607) (
-REMOVEITEM 134609 . 135485) (MOVETOFILE 135487 . 136317)) (136533 138904 (SAVEPUT 136543 . 138902)) (
-139029 147272 (UNMARKASCHANGED 139039 . 140523) (PREEDITFN 140525 . 143006) (POSTEDITPROPS 143008 . 
-145302) (POSTEDITALISTS 145304 . 147270)) (147417 166961 (ALISTS.GETDEF 147427 . 147806) (
-ALISTS.WHENCHANGED 147808 . 148454) (CLEARCLISPARRAY 148456 . 149634) (EXPRESSIONS.WHENCHANGED 149636
- . 150014) (MAKEALISTCOMS 150016 . 151031) (MAKEFILESCOMS 151033 . 152363) (MAKELISPXMACROSCOMS 152365
- . 154383) (MAKEPROPSCOMS 154385 . 155011) (MAKEUSERMACROSCOMS 155013 . 156830) (PROPS.WHENCHANGED 
-156832 . 157453) (FILEGETDEF.LISPXMACROS 157455 . 158754) (FILEGETDEF.ALISTS 158756 . 159347) (
-FILEGETDEF.RECORDS 159349 . 160276) (FILEGETDEF.PROPS 160278 . 161073) (FILEGETDEF.MACROS 161075 . 
-161957) (FILEGETDEF.VARS 161959 . 162562) (FILEGETDEF.FNS 162564 . 163878) (FILEPKGCOMS.PUTDEF 163880
- . 165822) (FILES.PUTDEF 165824 . 166692) (VARS.PUTDEF 166694 . 166837) (FILES.WHENCHANGED 166839 . 
-166959)) (168983 176214 (RENAME 168993 . 170438) (CHANGECALLERS 170440 . 176212)) (176215 224318 (
-SHOWDEF 176225 . 177422) (COPYDEF 177424 . 180172) (GETDEF 180174 . 182717) (GETDEFCOM 182719 . 183685
-) (GETDEFCOM0 183687 . 184880) (GETDEFCURRENT 184882 . 191388) (GETDEFERR 191390 . 192660) (
-GETDEFFROMFILE 192662 . 196891) (GETDEFSAVED 196893 . 197981) (PUTDEF 197983 . 198690) (EDITDEF 198692
- . 199675) (DEFAULT.EDITDEF 199677 . 202515) (EDITDEF.FILES 202517 . 202722) (LOADDEF 202724 . 202900)
- (DWIMDEF 202902 . 203756) (DELDEF 203758 . 206652) (DELFROMLIST 206654 . 207158) (HASDEF 207160 . 
-213397) (GETFILEDEF 213399 . 213911) (SAVEDEF 213913 . 215601) (UNSAVEDEF 215603 . 216499) (
-COMPAREDEFS 216501 . 220307) (COMPARE 220309 . 221013) (TYPESOF 221015 . 224316)) (224468 232716 (
-FILEPKGCOM 224478 . 229254) (FILEPKGTYPE 229256 . 232714)) (244749 262438 (FINDCALLERS 244759 . 245389
-) (EDITCALLERS 245391 . 256322) (EDITFROMFILE 256324 . 261753) (FINDATS 261755 . 262027) (LOOKIN 
-262029 . 262436)) (262439 264110 (SEPRCASE 262449 . 264108)) (264627 269820 (IMPORTFILE 264637 . 
-265607) (IMPORTEVAL 265609 . 266495) (IMPORTFILESCAN 266497 . 267100) (CHECKIMPORTS 267102 . 268358) (
-GATHEREXPORTS 268360 . 269228) (\DUMPEXPORTS 269230 . 269818)) (270158 272228 (CLEARFILEPKG 270168 . 
-272226)))))
+  (FILEMAP (NIL (18893 20566 (SEARCHPRETTYTYPELST 18903 . 19872) (PRETTYDEFMACROS 19874 . 20310) (
+FILEPKGCOMPROPS 20312 . 20564)) (21379 55778 (CLEANUP 21389 . 22779) (COMPILEFILES 22781 . 23057) (
+COMPILEFILES0 23059 . 23872) (CONTINUEDIT 23874 . 25251) (MAKEFILE 25253 . 36979) (FILECHANGES 36981
+ . 39745) (FILEPKG.MERGECHANGES 39747 . 40382) (FILEPKG.CHANGEDFNS 40384 . 40696) (MAKEFILE1 40698 . 
+44910) (COMPILE-FILE? 44912 . 46606) (MAKEFILES 46608 . 48136) (ADDFILE 48138 . 50681) (ADDFILE0 50683
+ . 54807) (LISTFILES 54809 . 55776)) (56450 90249 (FILEPKGCHANGES 56460 . 57639) (GETFILEPKGTYPE 57641
+ . 60591) (MARKASCHANGED 60593 . 62224) (FILECOMS 62226 . 62610) (WHEREIS 62612 . 64354) (
+SMASHFILECOMS 64356 . 64584) (FILEFNSLST 64586 . 64752) (FILECOMSLST 64754 . 65240) (UPDATEFILES 65242
+ . 69740) (INFILECOMS? 69742 . 71585) (INFILECOMTAIL 71587 . 72705) (INFILECOMS 72707 . 72868) (
+INFILECOM 72870 . 82888) (INFILECOMSVALS 82890 . 83197) (INFILECOMSVAL 83199 . 84207) (INFILECOMSPROP 
+84209 . 85002) (IFCPROPS 85004 . 86084) (IFCEXPRTYPE 86086 . 86702) (IFCPROPSCAN 86704 . 87665) (
+IFCDECLARE 87667 . 88926) (INFILEPAIRS 88928 . 89227) (INFILECOMSMACRO 89229 . 90247)) (90284 120970 (
+FILES? 90294 . 92405) (FILES?1 92407 . 93109) (FILES?PRINTLST 93111 . 93893) (ADDTOFILES? 93895 . 
+104438) (ADDTOFILE 104440 . 105356) (WHATIS 105358 . 107334) (ADDTOCOMS 107336 . 108874) (ADDTOCOM 
+108876 . 115363) (ADDTOCOM1 115365 . 116536) (ADDNEWCOM 116538 . 117588) (MAKENEWCOM 117590 . 119437) 
+(DEFAULTMAKENEWCOM 119439 . 120968)) (121040 123857 (MERGEINSERT 121050 . 123393) (MERGEINSERT1 123395
+ . 123855)) (124011 125372 (ADDTOFILEKEYLST 124021 . 125370)) (125489 136290 (DELFROMFILES 125499 . 
+126329) (DELFROMCOMS 126331 . 128010) (DELFROMCOM 128012 . 133777) (DELFROMCOM1 133779 . 134578) (
+REMOVEITEM 134580 . 135456) (MOVETOFILE 135458 . 136288)) (136504 138875 (SAVEPUT 136514 . 138873)) (
+139000 147243 (UNMARKASCHANGED 139010 . 140494) (PREEDITFN 140496 . 142977) (POSTEDITPROPS 142979 . 
+145273) (POSTEDITALISTS 145275 . 147241)) (147388 167392 (ALISTS.GETDEF 147398 . 147777) (
+ALISTS.WHENCHANGED 147779 . 148425) (CLEARCLISPARRAY 148427 . 149605) (EXPRESSIONS.WHENCHANGED 149607
+ . 149985) (MAKEALISTCOMS 149987 . 151002) (MAKEFILESCOMS 151004 . 152334) (MAKELISPXMACROSCOMS 152336
+ . 154354) (MAKEPROPSCOMS 154356 . 154982) (MAKEUSERMACROSCOMS 154984 . 156801) (PROPS.WHENCHANGED 
+156803 . 157424) (FILEGETDEF.LISPXMACROS 157426 . 158725) (FILEGETDEF.ALISTS 158727 . 159318) (
+FILEGETDEF.RECORDS 159320 . 160247) (FILEGETDEF.PROPS 160249 . 161044) (FILEGETDEF.MACROS 161046 . 
+161928) (FILEGETDEF.VARS 161930 . 162533) (FILEGETDEF.FNS 162535 . 164309) (FILEPKGCOMS.PUTDEF 164311
+ . 166253) (FILES.PUTDEF 166255 . 167123) (VARS.PUTDEF 167125 . 167268) (FILES.WHENCHANGED 167270 . 
+167390)) (169414 176645 (RENAME 169424 . 170869) (CHANGECALLERS 170871 . 176643)) (176646 224749 (
+SHOWDEF 176656 . 177853) (COPYDEF 177855 . 180603) (GETDEF 180605 . 183148) (GETDEFCOM 183150 . 184116
+) (GETDEFCOM0 184118 . 185311) (GETDEFCURRENT 185313 . 191819) (GETDEFERR 191821 . 193091) (
+GETDEFFROMFILE 193093 . 197322) (GETDEFSAVED 197324 . 198412) (PUTDEF 198414 . 199121) (EDITDEF 199123
+ . 200106) (DEFAULT.EDITDEF 200108 . 202946) (EDITDEF.FILES 202948 . 203153) (LOADDEF 203155 . 203331)
+ (DWIMDEF 203333 . 204187) (DELDEF 204189 . 207083) (DELFROMLIST 207085 . 207589) (HASDEF 207591 . 
+213828) (GETFILEDEF 213830 . 214342) (SAVEDEF 214344 . 216032) (UNSAVEDEF 216034 . 216930) (
+COMPAREDEFS 216932 . 220738) (COMPARE 220740 . 221444) (TYPESOF 221446 . 224747)) (224899 233147 (
+FILEPKGCOM 224909 . 229685) (FILEPKGTYPE 229687 . 233145)) (245180 262869 (FINDCALLERS 245190 . 245820
+) (EDITCALLERS 245822 . 256753) (EDITFROMFILE 256755 . 262184) (FINDATS 262186 . 262458) (LOOKIN 
+262460 . 262867)) (262870 264541 (SEPRCASE 262880 . 264539)) (265058 270251 (IMPORTFILE 265068 . 
+266038) (IMPORTEVAL 266040 . 266926) (IMPORTFILESCAN 266928 . 267531) (CHECKIMPORTS 267533 . 268789) (
+GATHEREXPORTS 268791 . 269659) (\DUMPEXPORTS 269661 . 270249)) (270589 272659 (CLEARFILEPKG 270599 . 
+272657)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 31aae9be..5becfbc7 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
diff --git a/sources/LOADFNS b/sources/LOADFNS
index b3bf4811..d9afbb54 100644
--- a/sources/LOADFNS
+++ b/sources/LOADFNS
@@ -1,18 +1,18 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "23-Feb-2026 00:49:17" {WMEDLEY}<sources>LOADFNS.;7 47671  
+(FILECREATED "25-Feb-2026 01:03:38" {WMEDLEY}<sources>LOADFNS.;8 47522  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS LOADFNS)
+      :CHANGES-TO (VARS LOADFNSCOMS)
 
-      :PREVIOUS-DATE "22-Feb-2026 18:01:39" {WMEDLEY}<sources>LOADFNS.;6)
+      :PREVIOUS-DATE "23-Feb-2026 00:49:17" {WMEDLEY}<sources>LOADFNS.;7)
 
 
 (PRETTYCOMPRINT LOADFNSCOMS)
 
 (RPAQQ LOADFNSCOMS
-       [(FNS LOADFROM LOADBLOCK GETBLOCKDEC LOADCOMP LOADCOMP? LOADVARS LOADEFS LOADFILEMAP LOADFNS 
+       [(FNS LOADFROM LOADBLOCK GETBLOCKDEC LOADCOMP LOADCOMP? LOADVARS LOADFILEMAP LOADFNS 
              LOADFNS-FINDFILE LOADFNS-MAKELIST)
         (FNS LOADFNSCAN SCANFILE0 SCANCOMPILEDFN SCANDEFINEQ SCANEXP SCANDECLARECOLON SCANFILE1 
              SCANFILE2 TMPSUBFN RETRYSCAN SCANFILEHELP)
@@ -96,10 +96,6 @@
   [LAMBDA (VARS FILE LDFLG)
     (LOADFNS NIL FILE LDFLG VARS])
 
-(LOADEFS
-  [LAMBDA (FNS FILE)                                         (* wt%: " 9-APR-80 20:27")
-    (LOADFNS FNS FILE 'GETDEF])
-
 (LOADFILEMAP
   [LAMBDA (FILE)                                             (* wt%: "16-MAY-79 22:05")
           
@@ -882,11 +878,11 @@ A map of non-functions is not kept because (a) it would not be of use to MAKEFIL
        (RETFNS SCANFILE0))
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1112 19926 (LOADFROM 1122 . 1595) (LOADBLOCK 1597 . 2105) (GETBLOCKDEC 2107 . 2972) (
-LOADCOMP 2974 . 4137) (LOADCOMP? 4139 . 4839) (LOADVARS 4841 . 4921) (LOADEFS 4923 . 5067) (
-LOADFILEMAP 5069 . 5473) (LOADFNS 5475 . 18211) (LOADFNS-FINDFILE 18213 . 18729) (LOADFNS-MAKELIST 
-18731 . 19924)) (19927 47138 (LOADFNSCAN 19937 . 20115) (SCANFILE0 20117 . 23524) (SCANCOMPILEDFN 
-23526 . 25828) (SCANDEFINEQ 25830 . 31128) (SCANEXP 31130 . 35881) (SCANDECLARECOLON 35883 . 40087) (
-SCANFILE1 40089 . 44171) (SCANFILE2 44173 . 44459) (TMPSUBFN 44461 . 45625) (RETRYSCAN 45627 . 46024) 
-(SCANFILEHELP 46026 . 47136)))))
+  (FILEMAP (NIL (1109 19777 (LOADFROM 1119 . 1592) (LOADBLOCK 1594 . 2102) (GETBLOCKDEC 2104 . 2969) (
+LOADCOMP 2971 . 4134) (LOADCOMP? 4136 . 4836) (LOADVARS 4838 . 4918) (LOADFILEMAP 4920 . 5324) (
+LOADFNS 5326 . 18062) (LOADFNS-FINDFILE 18064 . 18580) (LOADFNS-MAKELIST 18582 . 19775)) (19778 46989 
+(LOADFNSCAN 19788 . 19966) (SCANFILE0 19968 . 23375) (SCANCOMPILEDFN 23377 . 25679) (SCANDEFINEQ 25681
+ . 30979) (SCANEXP 30981 . 35732) (SCANDECLARECOLON 35734 . 39938) (SCANFILE1 39940 . 44022) (
+SCANFILE2 44024 . 44310) (TMPSUBFN 44312 . 45476) (RETRYSCAN 45478 . 45875) (SCANFILEHELP 45877 . 
+46987)))))
 STOP
diff --git a/sources/LOADFNS.LCOM b/sources/LOADFNS.LCOM
index 82f32fb1..e316b11f 100644
Binary files a/sources/LOADFNS.LCOM and b/sources/LOADFNS.LCOM differ
