@@ -5,15 +5,11 @@
 
 set ::xvfs::_xvfsDir [file dirname [info script]]
 
 # Functions
 proc ::xvfs::_emitLine {line} {
-	if {[info command ::minirivet::_emitOutput] ne ""} {
-		::minirivet::_emitOutput "${line}\n"
-	} else {
-		puts $line
-	}
+	lappend ::xvfs::_emitLine $line
 }
 
 proc ::xvfs::printHelp {channel {errors ""}} {
 	if {[llength $errors] != 0} {
 		foreach error $errors {
@@ -280,10 +276,13 @@
 	## 3. Start processing directory and producing initial output
 	set ::xvfs::outputFiles [processDirectory $fsName $rootDirectory]
 
 	set ::xvfs::fsName $fsName
 	set ::xvfs::rootDirectory $rootDirectory
+
+	# Return the output
+	return [join $::xvfs::_emitLine "\n"]
 }
 
 proc ::xvfs::run {args} {
 	uplevel #0 { package require minirivet }