Improving callback asserts