Reduce inconsistencies between codepaths for membership and non-membership events.