[RFA 0/2] Two trivial cli-out patches

[Tom Tromey]

While looking into ui-out a bit, I found a couple of oddities in
cli-out.  This short series fixes both.

Regression tested by the buildbot.

Tom