[Brian]

Reviewing the thread, I realize that one thing I failed to mention is that we've talked about was making "Waiting" and/or "On hold" into an action state, rather than linking it to contexts the way it currently is.

I don't think that we can do that for 1.8 - it's a bigger change - but maybe that's the best overall solution?