Some more leave event management logic.
Further improvements to leave event management.