Clean up %more-arg-values.