diff --git a/basis/opengl/capabilities/capabilities.factor b/basis/opengl/capabilities/capabilities.factor
index d658235cf6..806935d5c9 100755
--- a/basis/opengl/capabilities/capabilities.factor
+++ b/basis/opengl/capabilities/capabilities.factor
@@ -5,9 +5,9 @@ continuations math.parser math arrays sets math.order ;
 IN: opengl.capabilities
 
 : (require-gl) ( thing require-quot make-error-quot -- )
-    >r dupd call
-    [ r> 2drop ]
-    [ r> " " make throw ]
+    -rot dupd call
+    [ 2drop ]
+    [ swap " " make throw ]
     if ; inline
 
 : gl-extensions ( -- seq )
diff --git a/unmaintained/bunny/authors.txt b/extra/bunny/authors.txt
similarity index 100%
rename from unmaintained/bunny/authors.txt
rename to extra/bunny/authors.txt
diff --git a/unmaintained/bunny/bun_zipper.ply b/extra/bunny/bun_zipper.ply
similarity index 100%
rename from unmaintained/bunny/bun_zipper.ply
rename to extra/bunny/bun_zipper.ply
diff --git a/unmaintained/bunny/bunny.factor b/extra/bunny/bunny.factor
similarity index 100%
rename from unmaintained/bunny/bunny.factor
rename to extra/bunny/bunny.factor
diff --git a/unmaintained/bunny/cel-shaded/cel-shaded.factor b/extra/bunny/cel-shaded/cel-shaded.factor
similarity index 100%
rename from unmaintained/bunny/cel-shaded/cel-shaded.factor
rename to extra/bunny/cel-shaded/cel-shaded.factor
diff --git a/unmaintained/bunny/deploy.factor b/extra/bunny/deploy.factor
similarity index 100%
rename from unmaintained/bunny/deploy.factor
rename to extra/bunny/deploy.factor
diff --git a/unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor b/extra/bunny/fixed-pipeline/fixed-pipeline.factor
similarity index 100%
rename from unmaintained/bunny/fixed-pipeline/fixed-pipeline.factor
rename to extra/bunny/fixed-pipeline/fixed-pipeline.factor
diff --git a/unmaintained/bunny/model/model.factor b/extra/bunny/model/model.factor
similarity index 100%
rename from unmaintained/bunny/model/model.factor
rename to extra/bunny/model/model.factor
diff --git a/unmaintained/bunny/outlined/outlined.factor b/extra/bunny/outlined/outlined.factor
similarity index 97%
rename from unmaintained/bunny/outlined/outlined.factor
rename to extra/bunny/outlined/outlined.factor
index bf757c4fb3..cd67b8b33e 100755
--- a/unmaintained/bunny/outlined/outlined.factor
+++ b/extra/bunny/outlined/outlined.factor
@@ -139,11 +139,7 @@ TUPLE: bunny-outlined
 
 : <bunny-outlined> ( gadget -- draw )
     outlining-supported? [
-        pass1-program pass2-program {
-            (>>gadget)
-            (>>pass1-program)
-            (>>pass2-program)
-        } bunny-outlined construct
+        pass1-program pass2-program f f f f f bunny-outlined boa
     ] [ drop f ] if ;
 
 : (framebuffer-texture) ( dim iformat xformat -- texture )
diff --git a/unmaintained/bunny/summary.txt b/extra/bunny/summary.txt
similarity index 100%
rename from unmaintained/bunny/summary.txt
rename to extra/bunny/summary.txt
diff --git a/unmaintained/bunny/tags.txt b/extra/bunny/tags.txt
similarity index 100%
rename from unmaintained/bunny/tags.txt
rename to extra/bunny/tags.txt
diff --git a/extra/game-input/backend/backend.factor b/extra/game-input/backend/backend.factor
index cfba0a52f5..df61179da7 100644
--- a/extra/game-input/backend/backend.factor
+++ b/extra/game-input/backend/backend.factor
@@ -2,12 +2,14 @@ USING: eval multiline system combinators ;
 IN: game-input.backend
 
 STRING: set-backend-for-macosx
-USING: namespaces game-input.backend.iokit game-input ;
+USING: namespaces parser game-input.backend.iokit ;
+<< "game-input" (use+) >>
 iokit-game-input-backend game-input-backend set-global
 ;
 
 STRING: set-backend-for-windows
-USING: namespaces game-input.backend.dinput game-input ;
+USING: namespaces parser game-input.backend.dinput ;
+<< "game-input" (use+) >>
 dinput-game-input-backend game-input-backend set-global
 ;
 
diff --git a/extra/game-input/backend/dinput/dinput.factor b/extra/game-input/backend/dinput/dinput.factor
index 73c9f511a1..116faf60cd 100755
--- a/extra/game-input/backend/dinput/dinput.factor
+++ b/extra/game-input/backend/dinput/dinput.factor
@@ -1,10 +1,11 @@
-USING: windows.dinput windows.dinput.constants game-input
+USING: windows.dinput windows.dinput.constants parser
 symbols alien.c-types windows.ole32 namespaces assocs kernel
 arrays vectors windows.kernel32 windows.com windows.dinput
 shuffle windows.user32 windows.messages sequences combinators
 math.geometry.rect ui.windows accessors math windows alien
 alien.strings io.encodings.utf16 continuations byte-arrays
 locals game-input.backend.dinput.keys-array ;
+<< "game-input" (use+) >>
 IN: game-input.backend.dinput
 
 SINGLETON: dinput-game-input-backend
diff --git a/extra/game-input/backend/iokit/iokit.factor b/extra/game-input/backend/iokit/iokit.factor
index dcdfa6d192..4a7d251425 100755
--- a/extra/game-input/backend/iokit/iokit.factor
+++ b/extra/game-input/backend/iokit/iokit.factor
@@ -1,9 +1,10 @@
 USING: cocoa cocoa.plists core-foundation iokit iokit.hid
 kernel cocoa.enumeration destructors math.parser cocoa.application 
-sequences locals combinators.short-circuit game-input threads
+sequences locals combinators.short-circuit threads
 symbols namespaces assocs vectors arrays combinators
 core-foundation.run-loop accessors sequences.private
-alien.c-types math ;
+alien.c-types math parser ;
+<< "game-input" (use+) >>
 IN: game-input.backend.iokit
 
 SINGLETON: iokit-game-input-backend
diff --git a/extra/game-input/game-input.factor b/extra/game-input/game-input.factor
index 208c8476fc..18ec04df1f 100755
--- a/extra/game-input/game-input.factor
+++ b/extra/game-input/game-input.factor
@@ -28,7 +28,6 @@ M: f (reset-game-input) ;
 PRIVATE>
 
 : open-game-input ( -- )
-    load-game-input-backend
     game-input-opened? [
         (open-game-input) 
         game-input-opened on
@@ -76,3 +75,6 @@ M: keyboard-state clone
     call-next-method dup keys>> clone >>keys ;
 
 HOOK: read-keyboard game-input-backend ( -- keyboard-state )
+
+load-game-input-backend
+
diff --git a/extra/joystick-demo/deploy.factor b/extra/joystick-demo/deploy.factor
new file mode 100644
index 0000000000..8843ae66f3
--- /dev/null
+++ b/extra/joystick-demo/deploy.factor
@@ -0,0 +1,15 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-name "joystick-demo" }
+    { deploy-io 2 }
+    { deploy-word-defs? f }
+    { deploy-c-types? t }
+    { deploy-random? t }
+    { deploy-word-props? f }
+    { deploy-reflection 1 }
+    { deploy-threads? t }
+    { deploy-math? t }
+    { "stop-after-last-window?" t }
+    { deploy-ui? t }
+    { deploy-compiler? t }
+}