CmdLine can now generically push much faster

It is still unacceptable slow, but it's down from hundreds of seconds to
31 seconds.