Right, we could move that to the PushNotificationSenderEndpoint, which then invokes NotificationRouter.