We cleaned up the NotificationSpec by removing duplicate methods and
fixing some logic with .equals/id's