Index: lib/xvfs/xvfs.tcl
==================================================================
--- lib/xvfs/xvfs.tcl
+++ lib/xvfs/xvfs.tcl
@@ -251,12 +251,14 @@
 
 	set ::xvfs::fsName $fsName
 	set ::xvfs::rootDirectory $rootDirectory
 }
 
-proc ::xvfs::run {} {
+proc ::xvfs::run {argv} {
 	uplevel #0 { package require minirivet }
+
+	set ::xvfs::argv $argv
 	::minirivet::parse [file join $::xvfs::_xvfsDir xvfs.c.rvt]
 }
 
 proc ::xvfs::setOutputChannel {channel} {
 	uplevel #0 { package require minirivet }

Index: xvfs-create
==================================================================
--- xvfs-create
+++ xvfs-create
@@ -48,12 +48,11 @@
 		if {[info exists outputFile]} {
 			set fd [open $outputFile w]
 			::xvfs::setOutputChannel $fd
 		}
 
-		set ::xvfs::argv $argv
-		::xvfs::run
+		::xvfs::run $argv
 
 		if {[info exists fd]} {
 			close $fd
 		}
 	}