Clean up repeat code by using already implemented AbstractListenerAggreg...

...ate