Preparing to remove Argument class.
Preparing to remove Argument class.