Using the cleaner event interface to clean up some code
Patch for compilation on older versions of boost