Make a second test pass: exiting with ShouldNotDeploy if a subcommand so wishes.

Also, move some comments around.