This is related to #521 but more general - not too difficult to do, can be handled with a new keyword argument to `calibrate`
