Refactor Callback assert to use only callbacks