Switch client listener to just take a list of events