Simplify callback wrapping