More anotations
Simplify get_next_event

In preparation for allowing other types of schedulers, greatly simplify GNE