Simplify wrapping callback

Mikhail Mazurskiy requested to merge ash2k/cleanup into master Oct 02, 2021