diff --git a/basis/prettyprint/sections/sections-docs.factor b/basis/prettyprint/sections/sections-docs.factor
index b645fc0e8a..54384d9dda 100644
--- a/basis/prettyprint/sections/sections-docs.factor
+++ b/basis/prettyprint/sections/sections-docs.factor
@@ -154,7 +154,7 @@ HELP: empty-block?
 { $values { "block" block } { "?" boolean } }
 { $description "Tests if the block has no child sections." } ;
 
-HELP: if-nonempty
+HELP: unless-empty-block
 { $values { "block" block } { "quot" { $quotation ( block -- ) } } }
 { $description "If the block has child sections, calls the quotation, otherwise does nothing." } ;
 
diff --git a/basis/prettyprint/sections/sections.factor b/basis/prettyprint/sections/sections.factor
index 48175a945c..8cd172bffe 100644
--- a/basis/prettyprint/sections/sections.factor
+++ b/basis/prettyprint/sections/sections.factor
@@ -305,7 +305,7 @@ M: colon unindent-first-line? drop t ;
 
 ! Long section layout algorithm
 : chop-break ( seq -- seq )
-    dup last line-break? [ but-last-slice chop-break ] when ;
+    [ dup last line-break? ] [ but-last-slice ] while ;
 
 SYMBOL: prev
 SYMBOL: next
@@ -314,7 +314,7 @@ SYMBOL: next
 
 : split-before ( section -- )
     {
-        [ start-group?>> prev get [ end-group?>> ] [ t ] if* and ]
+        [ start-group?>> prev get [ end-group?>> and ] when* ]
         [ flow? prev get flow? not and ]
     } 1|| split-groups ;