Refactors how expected callback events are modeled