Final commit on Event and Plugin APIs. Or I hope it is ;]