Agreed, and if/when we change the default to `Stopped`, it will do the right thing for us without further changes here.