Squashing the event_listener commits into one.