Clean up deprecation warnings about arg/kwarg passing

Parse the arg/kwargs up on the master before we send them down