Various refactors to the application service notifier code.