Few tweaks to notification refactorings.