I hate this, but for simplicity, I think we should do the event arg changes in a separate PR. My thinking is that it's easy to skim this and miss the fact that there's an event arg change.