A couple more additions to the stub CLI.