diff --git a/sources/BOOTSTRAP b/sources/BOOTSTRAP
index 61339fa6..ebcd8a76 100644
--- a/sources/BOOTSTRAP
+++ b/sources/BOOTSTRAP
@@ -1,12 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "25-Feb-2026 15:03:24" {WMEDLEY}<sources>BOOTSTRAP.;69 47041  
+(FILECREATED " 2-Mar-2026 12:03:05" {WMEDLEY}<sources>BOOTSTRAP.;71 47856  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS MAKE-DEFINE-FILE-INFO-ENV READ-READER-ENVIRONMENT)
+      :CHANGES-TO (FNS READ-READER-ENVIRONMENT)
 
-      :PREVIOUS-DATE "25-Feb-2026 13:52:00" {WMEDLEY}<sources>BOOTSTRAP.;66)
+      :PREVIOUS-DATE "25-Feb-2026 15:03:24" {WMEDLEY}<sources>BOOTSTRAP.;69)
 
 
 (PRETTYCOMPRINT BOOTSTRAPCOMS)
@@ -800,7 +800,9 @@
              (TERPRI STREAM)))])
 
 (READ-READER-ENVIRONMENT
-  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                     (* ; "Edited 25-Feb-2026 14:15 by rmk")
+  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                     (* ; "Edited  2-Mar-2026 12:03 by rmk")
+                                                             (* ; "Edited  1-Mar-2026 10:49 by rmk")
+                                                             (* ; "Edited 25-Feb-2026 14:15 by rmk")
                                                             (* ; "Edited 26-Sep-2021 23:31 by rmk:")
 
     (* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
@@ -809,42 +811,49 @@
 
     (* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")
 
-    (CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
-    (LET ((START (GETFILEPTR STREAM))
-          ARGS
-          (ENV DEFAULTENV)
-          (*READTABLE* (FETCH (READER-ENVIRONMENT REREADTABLE) OF *OLD-INTERLISP-READ-ENVIRONMENT*)))
-         (DECLARE (SPECVARS *READTABLE*))
-         (SETFILEPTR STREAM 0)                               (* ; "Hope we are RANDACCESSP")
-         (SELCHARQ (SKIPSEPRCODES STREAM)
-              (";"                                           (* ; "Assume it's a common lisp file")
-                   (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
+    (if (\GETSTREAM STREAM 'INPUT T)
+        then (CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
+             (LET ((START (GETFILEPTR STREAM))
+                   ARGS
+                   (ENV DEFAULTENV)
+                   (*READTABLE* (FETCH (READER-ENVIRONMENT REREADTABLE) OF 
+                                                                     *OLD-INTERLISP-READ-ENVIRONMENT*
+                                       )))
+                  (DECLARE (SPECVARS *READTABLE*))
+                  (SETFILEPTR STREAM 0)                      (* ; "Hope we are RANDACCESSP")
+                  (SELCHARQ (SKIPSEPRCODES STREAM)
+                       (";"                                  (* ; "Assume it's a common lisp file")
+                            (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                        *COMMON-LISP-READ-ENVIRONMENT*
-                                                  ))
-                   *COMMON-LISP-READ-ENVIRONMENT*)
-              ("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
+                                                           ))
+                            *COMMON-LISP-READ-ENVIRONMENT*)
+                       ("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                                *DEFINE-FILE-INFO-ENV*
-                                                  ))         (* ; 
+                                                           ))(* ; 
                                                              "Should we reset the format if we fail?")
-                   (READCCODE STREAM)
-                   (WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
-                       (if (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
-                           then 
-                                (* ;; 
+                            (READCCODE STREAM)
+                            (WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
+                                (if (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
+                                    then 
+                                         (* ;; 
         "After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")
 
-                                (SETQ ARGS (CL:READ-DELIMITED-LIST (CHARCODE ")")
-                                                  STREAM))
-                                (SETQ ENV (\DO-DEFINE-FILE-INFO STREAM ARGS))
-                         else (SETFILEPTR STREAM START))
+                                         (SETQ ARGS (CL:READ-DELIMITED-LIST (CHARCODE ")")
+                                                           STREAM))
+                                         (SETQ ENV (\DO-DEFINE-FILE-INFO STREAM ARGS))
+                                  else (SETFILEPTR STREAM START))
 
-                       (* ;; 
+                                (* ;; 
                    "If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")
 
-                       (CL:IF (AND RETURNFORM ARGS)
-                           (CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
-                           ENV)))
-              DEFAULTENV])
+                                (CL:IF (AND RETURNFORM ARGS)
+                                    (CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
+                                    ENV)))
+                       DEFAULTENV))
+      else (CL:WITH-OPEN-FILE (STRM (OR (FINDFILE STREAM T)
+                                        STREAM)
+                                    :DIRECTION :INPUT)
+                  (READ-READER-ENVIRONMENT STRM DEFAULTENV RETURNFORM])
 
 (MAKE-DEFINE-FILE-INFO-ENV
   [LAMBDA NIL                                                (* ; "Edited 25-Feb-2026 15:03 by rmk")
@@ -969,13 +978,13 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4621 14293 (GETPROP 4631 . 5203) (SETATOMVAL 5205 . 5334) (RPAQQ 5336 . 5389) (RPAQ 
-5391 . 5703) (RPAQ? 5705 . 6075) (MOVD 6077 . 7941) (MOVD? 7943 . 8373) (SELECTQ 8375 . 8562) (
-SELECTQ1 8564 . 8906) (NCONC1 8908 . 9104) (PUTPROP 9106 . 10590) (PROPNAMES 10592 . 10783) (ADDPROP 
-10785 . 12848) (REMPROP 12850 . 13704) (MEMB 13706 . 13965) (CLOSEF? 13967 . 14291)) (14366 34343 (
-LOAD 14376 . 15545) (\LOAD-STREAM 15547 . 28034) (FILECREATED 28036 . 29454) (FILECREATED1 29456 . 
-30564) (PRETTYCOMPRINT 30566 . 31051) (BOOTSTRAP-NAMEFIELD 31053 . 32013) (PUTPROPS 32015 . 32383) (
-DECLARE%: 32385 . 32517) (DECLARE%:1 32519 . 33391) (ROOTFILENAME 33393 . 34341)) (34381 44987 (
-DEFINE-FILE-INFO 34391 . 34826) (\DO-DEFINE-FILE-INFO 34828 . 38971) (PRINT-READER-ENVIRONMENT 38973
- . 40725) (READ-READER-ENVIRONMENT 40727 . 43553) (MAKE-DEFINE-FILE-INFO-ENV 43555 . 44985)))))
+  (FILEMAP (NIL (4595 14267 (GETPROP 4605 . 5177) (SETATOMVAL 5179 . 5308) (RPAQQ 5310 . 5363) (RPAQ 
+5365 . 5677) (RPAQ? 5679 . 6049) (MOVD 6051 . 7915) (MOVD? 7917 . 8347) (SELECTQ 8349 . 8536) (
+SELECTQ1 8538 . 8880) (NCONC1 8882 . 9078) (PUTPROP 9080 . 10564) (PROPNAMES 10566 . 10757) (ADDPROP 
+10759 . 12822) (REMPROP 12824 . 13678) (MEMB 13680 . 13939) (CLOSEF? 13941 . 14265)) (14340 34317 (
+LOAD 14350 . 15519) (\LOAD-STREAM 15521 . 28008) (FILECREATED 28010 . 29428) (FILECREATED1 29430 . 
+30538) (PRETTYCOMPRINT 30540 . 31025) (BOOTSTRAP-NAMEFIELD 31027 . 31987) (PUTPROPS 31989 . 32357) (
+DECLARE%: 32359 . 32491) (DECLARE%:1 32493 . 33365) (ROOTFILENAME 33367 . 34315)) (34355 45802 (
+DEFINE-FILE-INFO 34365 . 34800) (\DO-DEFINE-FILE-INFO 34802 . 38945) (PRINT-READER-ENVIRONMENT 38947
+ . 40699) (READ-READER-ENVIRONMENT 40701 . 44368) (MAKE-DEFINE-FILE-INFO-ENV 44370 . 45800)))))
 STOP
diff --git a/sources/BOOTSTRAP.LCOM b/sources/BOOTSTRAP.LCOM
index 043018dc..74f0d1d8 100644
Binary files a/sources/BOOTSTRAP.LCOM and b/sources/BOOTSTRAP.LCOM differ
