diff --git a/basis/tools/disassembler/disassembler.factor b/basis/tools/disassembler/disassembler.factor
index fac340845b..2a717c084f 100644
--- a/basis/tools/disassembler/disassembler.factor
+++ b/basis/tools/disassembler/disassembler.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: tr arrays sequences io words generic system combinators
-vocabs.loader ;
+vocabs.loader kernel ;
 IN: tools.disassembler
 
 GENERIC: disassemble ( obj -- )
@@ -18,8 +18,7 @@ M: word disassemble word-xt 2array disassemble ;
 
 M: method-spec disassemble first2 method disassemble ;
 
-cpu {
-    { x86.32 [ "tools.disassembler.udis" ] }
-    { x86.64 [ "tools.disassembler.udis" ] }
-    { ppc [ "tools.disassembler.gdb" ] }
-} case require
+cpu x86? os unix? and
+"tools.disassembler.udis"
+"tools.disassembler.gdb" ?
+require
diff --git a/extra/iokit/iokit.factor b/extra/iokit/iokit.factor
index 680723def9..2317d21ed5 100755
--- a/extra/iokit/iokit.factor
+++ b/extra/iokit/iokit.factor
@@ -1,5 +1,6 @@
-USING: alien.syntax alien.c-types core-foundation system
-combinators kernel sequences debugger io accessors ;
+USING: alien.syntax alien.c-types core-foundation
+core-foundation.bundles system combinators kernel sequences
+debugger io accessors ;
 IN: iokit
 
 <<