remove need for specification of stop/wait type

because it can be inferred from the args passed in