Fix more event leaks.
Removed TODO comment.