I would move this if in here, so that we always send an observer notification. Other extensions may want to rely on the notification and then could benefit from.