A bit of work on event and collection management.