Updates to match HasListEvents/ListObserver API changes