Think I fixed the even handler leakage.