diff --git a/extra/editors/gvim/gvim.factor b/extra/editors/gvim/gvim.factor
index 62150bdf49..240af7d8ef 100755
--- a/extra/editors/gvim/gvim.factor
+++ b/extra/editors/gvim/gvim.factor
@@ -3,14 +3,14 @@ namespaces sequences system combinators
 editors.vim editors.gvim.backend vocabs.loader ;
 IN: editors.gvim
 
-TUPLE: gvim ;
+SINGLETON: gvim
 
 M: gvim vim-command ( file line -- string )
-    [ "\"" % gvim-path % "\" \"" % swap % "\" +" % # ] "" make ;
+    [ gvim-path , swap , "+" swap number>string append , ] { } make ;
 
 t vim-detach set-global ! don't block the ui
 
-T{ gvim } vim-editor set-global
+gvim vim-editor set-global
 
 {
     { [ os unix? ] [ "editors.gvim.unix" ] }
diff --git a/extra/editors/vim/vim.factor b/extra/editors/vim/vim.factor
index 8ec94a7fd6..29c16f7cc3 100755
--- a/extra/editors/vim/vim.factor
+++ b/extra/editors/vim/vim.factor
@@ -8,7 +8,7 @@ SYMBOL: vim-detach
 SYMBOL: vim-editor
 HOOK: vim-command vim-editor ( file line -- array )
 
-TUPLE: vim ;
+SINGLETON: vim
 
 M: vim vim-command
     [
@@ -23,4 +23,4 @@ M: vim vim-command
 
 "vim" vim-path set-global
 [ vim-location ] edit-hook set-global
-T{ vim } vim-editor set-global
+vim vim-editor set-global