Comment 2 for bug 1235245

Oh, and minor style issue while I'm here. :)

`if cli == True:` is better written just `if cli:`

We generally don't test explicit equality against True or False.