Simplify finding of necessary callbacks

Simplify finding of necessary callbacks.