Address review comments.
Replaced calls to launch(), changed method name, made wait_for explicit.