Fix issue where adding listeners would inappropriately trigger `*` listeners