Small refactorings to notifiers