diff --git a/library/compiler/x86/alien.factor b/library/compiler/x86/alien.factor
index e3ee5c5492..1f8204c87f 100644
--- a/library/compiler/x86/alien.factor
+++ b/library/compiler/x86/alien.factor
@@ -27,8 +27,8 @@ M: float-regs pop-return-reg
 M: float-regs load-return-reg
     reg-size >r ESP swap [+] r> FLD ;
 
-M: %unbox generate-node
-    drop 2 input f compile-c-call  1 input push-return-reg ;
+: %unbox ( n reg-class func -- )
+    f %alien-invoke push-return-reg drop ;
 
 : struct-ptr/size ( size func -- )
     ! Load struct size
diff --git a/library/compiler/x86/assembler.factor b/library/compiler/x86/assembler.factor
index 8521eb4aa0..7ab30b76cb 100644
--- a/library/compiler/x86/assembler.factor
+++ b/library/compiler/x86/assembler.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005 Slava Pestov.
 ! See http://factor.sf.net/license.txt for BSD license.
-IN: assembler
 USING: arrays compiler errors generic kernel kernel-internals
 lists math namespaces parser sequences words ;
+IN: assembler
 
 ! A postfix assembler for x86 and AMD64.