Hmm. For backwards compatibility it's probably best to split the two callbacks.