Index: /trunk/ccl/level-1/l1-boot-lds.lisp
===================================================================
--- /trunk/ccl/level-1/l1-boot-lds.lisp	(revision 5018)
+++ /trunk/ccl/level-1/l1-boot-lds.lisp	(revision 5019)
@@ -85,8 +85,5 @@
 			    (unwind-protect
 				 (progn
-				   (with-lock-grabbed
-				       (*auto-flush-streams-lock*)
-				     (pushnew output-stream
-					      *auto-flush-streams*))
+                                   (add-autoflush-stream output-stream)
 				   (let* ((shared-input
 					   (input-stream-shared-resource
@@ -100,9 +97,5 @@
                                     :note-current-package *package*)
 				   (funcall initial-function))
-			      (with-lock-grabbed
-				  (*auto-flush-streams-lock*)
-				(setq *auto-flush-streams*
-				      (delete output-stream
-					      *auto-flush-streams*)))
+                              (remove-autoflush-stream output-stream)
 			      (funcall cleanup-function)
 			      (when close-streams
