Follow up. Really fixed the bug where listeners weren't called when some
of them removed themselfs during execution.