Don't force nowait if the option is explicitly given