More notification refactoring: queue dispatch rework.