Fix broken command line rendering. 

Command line rendering has been broken for a while now, this fixes it. Will put in a similar PR on stable-1.0 as well.