diff --git a/core/hashtables/hashtables-tests.factor b/core/hashtables/hashtables-tests.factor
index acb05be720..31486372f2 100755
--- a/core/hashtables/hashtables-tests.factor
+++ b/core/hashtables/hashtables-tests.factor
@@ -157,8 +157,12 @@ H{ } "x" set
 ] unit-test
 
 [ { "one" "two" 3 } ] [
-    H{ { 1 "one" } { 2 "two" } }
-    { 1 2 3 } clone [ substitute ] keep
+    { 1 2 3 } clone dup
+    H{ { 1 "one" } { 2 "two" } } substitute-here
+] unit-test
+
+[ { "one" "two" 3 } ] [
+    { 1 2 3 } H{ { 1 "one" } { 2 "two" } } substitute
 ] unit-test
 
 [ f ] [ { 0 1 1 2 3 5 } all-unique? ] unit-test
diff --git a/extra/cryptlib/streams/streams.factor b/extra/cryptlib/streams/streams.factor
index 04106285e0..9473e6063f 100755
--- a/extra/cryptlib/streams/streams.factor
+++ b/extra/cryptlib/streams/streams.factor
@@ -23,10 +23,10 @@ TUPLE: crypt-stream handle eof? ;
     CRYPT_SESSINFO_ACTIVE 1 set-attribute ;
 
 : <crypt-stream> ( handle -- stream )
-    crypt-stream construct-empty
-    over init-crypt-stream
-    default-buffer-size <buffer> over set-delegate
-    tuck set-crypt-stream-handle 
+    dup init-crypt-stream
+    default-buffer-size <buffer>
+    { set-crypt-stream-handle set-delegate }
+    crypt-stream construct
     dup <line-reader> swap <plain-writer> <duplex-stream> ;
 
 : check-read ( err -- eof? )
diff --git a/extra/smtp/smtp-tests.factor b/extra/smtp/smtp-tests.factor
index aa3641417b..20130bec2e 100755
--- a/extra/smtp/smtp-tests.factor
+++ b/extra/smtp/smtp-tests.factor
@@ -62,7 +62,7 @@ IN: temporary
         "Subject: Factor rules"
         f
         f
-        " "
+        ""
         "Hi guys"
         "Bye guys"
     }