Undo the BroadcastEventListener and BroadcastLifecycleListener refactor, since now it only serves to make the code longer.