Remove the "do_wait" parameter which is always true.  Check only
command==NONE and merge the "return" statements.