Wait for both the client and the injector to finish.

The previous approach failed with "fast" injectors, such as the Windows
DLL one, since they could be finished on our side before the the client
had been launched.