Change EventQueue to List

To avoid potentially invalidating iterators