Fix some stupid CLI handling code I wrote.