Always use build_cmd_str.

A small fix and a little cleanup was also included.  

It is hard for me to test beyond the commands I use in my application.  So I will try to add tests later with some sort of mock serial port.