Put back some of the args stuff -- needed for plots.