Fixes event listeners to properly handle listeners that change listen events / have variable listen events