Move calc stuff from tune.plot to tune.calc, remove 'plot' kwarg