Move #deliver invocation up to Notifier