Yet more notification optimizations.