Actually honor the --nowait option (bug #41)