Fixed a tricky little bug where events were getting circular links to
each other.