diff --git a/src/cmp/cmpopt.lsp b/src/cmp/cmpopt.lsp
index 88e7c1a3a..4e15841d1 100644
--- a/src/cmp/cmpopt.lsp
+++ b/src/cmp/cmpopt.lsp
@@ -187,8 +187,7 @@
            (si::while ,list-var
              (let ((,var (first ,typed-var)))
                (declare ,@declarations)
-               (tagbody
-                  ,@body))
+               (tagbody ,@body))
              (setq ,list-var (rest ,typed-var)))
            ,(when output-form
               `(let ((,var nil))