diff --git a/core/debugger/debugger.factor b/core/debugger/debugger.factor
index e6dfb79e07..17219ba92b 100755
--- a/core/debugger/debugger.factor
+++ b/core/debugger/debugger.factor
@@ -93,7 +93,7 @@ M: relative-overflow summary
     drop "Superfluous items pushed to data stack" ;
 
 : assert-depth ( quot -- )
-    >r datastack r> swap slip >r datastack r>
+    >r datastack r> dip >r datastack r>
     2dup [ length ] compare {
         { +lt+ [ trim-datastacks nip relative-underflow ] }
         { +eq+ [ 2drop ] }
diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index a989d6c833..9112dbf25e 100755
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -57,6 +57,8 @@ DEFER: if
 
 : dip ( obj quot -- obj ) swap slip ; inline
 
+: 2dip ( obj1 obj2 quot -- obj1 obj2 ) -rot 2slip ; inline
+
 ! Keepers
 : keep ( x quot -- x ) over slip ; inline
 
@@ -88,14 +90,14 @@ DEFER: if
 
 ! Spreaders
 : bi* ( x y p q -- )
-    >r swap slip r> call ; inline
+    >r dip r> call ; inline
 
 : tri* ( x y z p q r -- )
     >r rot >r bi* r> r> call ; inline
 
 ! Double spreaders
 : 2bi* ( w x y z p q -- )
-    >r -rot 2slip r> call ; inline
+    >r 2dip r> call ; inline
 
 ! Appliers
 : bi@ ( x y quot -- )
diff --git a/extra/concurrency/mailboxes/mailboxes.factor b/extra/concurrency/mailboxes/mailboxes.factor
index faa3a29610..1f94e018c9 100755
--- a/extra/concurrency/mailboxes/mailboxes.factor
+++ b/extra/concurrency/mailboxes/mailboxes.factor
@@ -58,7 +58,7 @@ M: mailbox dispose* threads>> notify-all ;
 
 : while-mailbox-empty ( mailbox quot -- )
     over mailbox-empty? [
-        dup >r swap slip r> while-mailbox-empty
+        dup >r dip r> while-mailbox-empty
     ] [
         2drop
     ] if ; inline
diff --git a/extra/shuffle/shuffle.factor b/extra/shuffle/shuffle.factor
index 3d8a390d13..2366d15cff 100644
--- a/extra/shuffle/shuffle.factor
+++ b/extra/shuffle/shuffle.factor
@@ -5,8 +5,6 @@ USING: kernel sequences namespaces math inference.transforms
 
 IN: shuffle
 
-: 2dip -rot 2slip ; inline
-
 MACRO: npick ( n -- ) 1- dup saver [ dup ] rot [ r> swap ] n*quot 3append ;
 
 MACRO: ndup ( n -- ) dup [ npick ] curry n*quot ;
diff --git a/extra/tools/test/ui/ui.factor b/extra/tools/test/ui/ui.factor
index 8825cffa4d..666a7d24d9 100755
--- a/extra/tools/test/ui/ui.factor
+++ b/extra/tools/test/ui/ui.factor
@@ -10,7 +10,7 @@ IN: tools.test.ui
         <dlist> \ graft-queue [
             over
             graft notify-queued
-            swap slip
+            dip
             ungraft notify-queued
         ] with-variable
     ] with-string-writer print ;
diff --git a/extra/webapps/pastebin/pastebin.factor b/extra/webapps/pastebin/pastebin.factor
index a18eb8147c..273b250695 100644
--- a/extra/webapps/pastebin/pastebin.factor
+++ b/extra/webapps/pastebin/pastebin.factor
@@ -64,14 +64,14 @@ annotation "ANNOTATION"
     ] unless ;
 
 : <annotation-form> ( -- form )
-    "paste" <form>
+    "annotation" <form>
+        "annotation" pastebin-template >>view-template
         "id" <integer>
             hidden >>renderer
             add-field
         "aid" <integer>
             hidden >>renderer
             add-field
-        "annotation" pastebin-template >>view-template
         "summary" <string> add-field
         "author" <string> add-field
         "mode" <mode> add-field
@@ -79,7 +79,7 @@ annotation "ANNOTATION"
         "date" <date> add-field ;
 
 : <new-annotation-form> ( -- form )
-    "paste" <form>
+    "annotation" <form>
         "new-annotation" pastebin-template >>edit-template
         "id" <integer>
             hidden >>renderer