Cleanup the use of evented?

There was some remnants of dead code after a few speed refactors.
Also, a lot of duplication. 

This tidies that up.