Take a look at my thoughts above about `ScheduledAction` and how if we eliminate the multiple layers of wrapping we can probably remove the need for this.