Revert "Clean up %more-arg-values."