Refactors how expected callback events are modeled
Merge pull request #629 from dimagi/gc-dev

Refactors how expected callback events are modeled