Remove optimization and replace with extra sanity checking of "last event always first" theory.

If/when confirmed, this can be reverted.