diff --git a/extra/readline-listener/readline-listener.factor b/extra/readline-listener/readline-listener.factor
index 2317631b6d..c1eba4e96d 100644
--- a/extra/readline-listener/readline-listener.factor
+++ b/extra/readline-listener/readline-listener.factor
@@ -4,7 +4,6 @@ USING: accessors alien.data fry io io.encodings.utf8 kernel
 listener namespaces readline sequences threads vocabs
 command-line vocabs.hierarchy sequences.deep locals
 splitting math ;
-QUALIFIED: readline.ffi
 IN: readline-listener
 
 <PRIVATE
diff --git a/extra/readline/readline.factor b/extra/readline/readline.factor
index 688934cba4..6ce6a1cf9b 100644
--- a/extra/readline/readline.factor
+++ b/extra/readline/readline.factor
@@ -18,13 +18,14 @@ IN: readline
 : current-line ( -- str )
     readline.ffi:rl_line_buffer ;
 
-: has-readline ( -- ? )
+: has-readline? ( -- ? )
     "readline" dup load-library dlsym-raw >boolean ;
 
-MACRO: set-completion ( quot -- )
+: set-completion ( quot -- )
     [
-       '[ @ [ utf8 malloc-string ] [ f ] if* ]
-       '[ _ readline.ffi:rl_compentry_func_t ]
-        (( -- alien )) define-temp
-    ] with-compilation-unit execute
-    '[ _ readline.ffi:set-rl_completion_entry_function ] ;
+       '[
+            [ @ [ utf8 malloc-string ] [ f ] if* ]
+            readline.ffi:rl_compentry_func_t
+        ] (( -- alien )) define-temp
+    ] with-compilation-unit execute( -- alien )
+    readline.ffi:set-rl_completion_entry_function ;