[minor] Optimize for 1 event listener
Merge branch 'fnobj'