Correct expression parsing

Expression parsing was not really working for anything but the most trivial of cases.  This now fixes it up to the point where I think it works for most situations.
Merge branch 'feature/operator-fixes'