Mop up the ThreadingServiceContext thingy
A bit of refactoring on the Event manager stuff