Cleanup around xvfs::argv