Minor changes

Agreed that it's hard to follow.  Well fwiw I've been using `state=restarted` for a while and it works as expected.  And I really think we should be declarative about our intent