Revert "Wrap-arg modified to be more generic."

This reverts commit fec7b246c530ce4b1a27b0cbfdaf8e4e9aa6e881.