fixed improper x_ in MakeVariadic, and added better error checking.