Wrap-arg modified to be more generic.

Tested against the PieChart