Optimise events more.