Fix up some inconsistencies in the callbacks.
Fix up some inconsistencies in the callbacks.

betatim/BlackBox,scikit-optimize/scikit-optimize,scikit-optimize/scikit-optimize,betatim/BlackBox,ccauet/scikit-optimize