Make make-stub take n args, instead of a vector