Improve event subsystem.