Fixed a small bug by previous commit, now use a dict for returning the arguments in fvctl-like fashion