cpp_v2 - lib: little cleanup in event handlers