This will also fix some bugs where the event type being accessed would not be available, since it is now built on-demand, without the need to keep track for the count of each event type.
6d1bc22