Changed the grouping of the callback handlers to remove the warning messages.