diff --git a/extra/io/sockets/impl/impl.factor b/extra/io/sockets/impl/impl.factor
index d7ac18ee20..77e8e098b1 100755
--- a/extra/io/sockets/impl/impl.factor
+++ b/extra/io/sockets/impl/impl.factor
@@ -53,7 +53,7 @@ M: inet4 make-sockaddr ( inet -- sockaddr )
 
 SYMBOL: port-override
 
-: (port) port-override get [ ] [ ] ?if ;
+: (port) port-override get swap or ;
 
 M: inet4 parse-sockaddr
     >r dup sockaddr-in-addr <uint> r> inet-ntop
diff --git a/extra/smtp/smtp.factor b/extra/smtp/smtp.factor
index c74a6e72fb..184bd0c1cc 100755
--- a/extra/smtp/smtp.factor
+++ b/extra/smtp/smtp.factor
@@ -114,7 +114,7 @@ LOG: smtp-response DEBUG
 
 : extract-email ( recepient -- email )
     #! This could be much smarter.
-    " " last-split1 [ ] [ ] ?if "<" ?head drop ">" ?tail drop ;
+    " " last-split1 swap or "<" ?head drop ">" ?tail drop ;
 
 : message-id ( -- string )
     [