WIP: (detangling) simplify event callback usage