Refactor event listener data structure to make it more amenable to the R4.3 service event listener hook. (FELIX-3056)