Updated with variadic changes.