Don't include events in queue when bookkeeping

Does this fix what you were talking about in the emails?
What's one of the test cases where a lot were left in the queue?