Delivery action and user notification refactoring.