Updated for latest nightlies.

EventAction now only listens while it's active, making my
ResetAfterCompleteAction approach unnecessary.