It should be fairly simple to guarantee notification variables are set for the actual actions that notifications are for (start, stop, promote, and demote). Most likely we would need to use the "pre-action" values.