Improve command error handling to gracefully degrade when expressions are used

[pappleby]

Turns out commands are more different from function call syntax that initially assumed. Ie, they are not this:

As an example of where the current handling breaks down, in the following code, all three calls to FunctionExample are semantically equivalent.