Made simple improvement to event collection.  Now indexes event dictionaries off of event class type, rather than a hard-coded string.