Minor refinements to the notification system.