Move towards cleaner events module.