Minor changes to keep track of all event depths