Fix up multivalued argument handling.