Fix minor load problems from words being moved around

basis/libc/libc.factor

@@ -23,11 +23,12 @@ IN: libc
 SYMBOL: malloc-expiry
 
 : mallocs ( -- assoc )
-    malloc-expiry get-global dup expired? [
-        drop
+    malloc-expiry get-global expired? [
         -1 <alien> malloc-expiry set-global
         H{ } clone dup \ mallocs set-global
-    ] when ;
+    ] [
+        \ mallocs get-global
+    ] if ;
 
 PRIVATE>
 

extra/builder/util/util.factor

@@ -6,7 +6,7 @@ USING: kernel words namespaces classes parser continuations
        combinators sequences splitting quotations arrays strings tools.time
        sequences.deep accessors assocs.lib
        io.encodings.utf8
-       combinators.cleave calendar calendar.format ;
+       combinators.cleave calendar calendar.format eval ;
 
 IN: builder.util
 

extra/shell/shell.factor

@@ -3,7 +3,7 @@ USING: kernel parser words continuations namespaces debugger
        sequences combinators splitting prettyprint
        system io io.files io.launcher io.encodings.utf8 io.pipes sequences.deep
        accessors multi-methods newfx shell.parser
-       combinators.short-circuit ;
+       combinators.short-circuit eval ;
 
 IN: shell