Index: /trunk/ccl/lib/macros.lisp
===================================================================
--- /trunk/ccl/lib/macros.lisp	(revision 5407)
+++ /trunk/ccl/lib/macros.lisp	(revision 5408)
@@ -3229,6 +3229,5 @@
                                   (ioblock-inbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed ((locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock)))
+        (with-lock-grabbed (,lock)
           ,@body)
         (progn
@@ -3239,8 +3238,7 @@
   (let* ((lock (gensym)))
     `(let* ((,lock (locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock))))
+                                  (ioblock-outbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed ((locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-outbuf-lock ,ioblock)))
+        (with-lock-grabbed (,lock)
           ,@body)
         (progn
@@ -3253,8 +3251,7 @@
   (let* ((lock (gensym)))
     `(let* ((,lock (locally (declare (optimize (speed 3) (safety 0)))
-                                  (ioblock-inbuf-lock ,ioblock))))
+                                  (ioblock-outbuf-lock ,ioblock))))
       (if ,lock
-        (with-ioblock-lock-grabbed-maybe ((locally (declare (optimize (speed 3) (safety 0)))
-                                            (ioblock-outbuf-lock ,ioblock)))
+        (with-lock-grabbed-maybe (,lock)
           ,@body)
         (progn