I worry about people thinking wait-time=0 meaning wait forever, as that's convention in some projects (not here, please). Could we have a non-zero int 'wait-time' flag in addition to a 'no-wait' boolean?

This sounds like something @philips should weigh in on given my recent discussions with him.