[misc] Cleanup
XCOMMONS-518: Introduce AbstractEventListener