Improve event validation (#16908).