Prevent waiting for confirms unless selected
Use less state
Cosmetic
Less severe failure when waiting on unselected channels
fix bug in test
it's a throw, not an exit
merge bug25356 into default