Fix event listener add/remove lifecycle; fix mixin accordingly