Improvements to the CommandWithTerms Class

Done all the feedback from @danielbachhuber .
Related #1379