Make sure we bail out nicely if the stubbed new callbacks are invoked. Few cleanups also.