Discovered issue with params with double negatives.

Expression such as (2)--2 does not evaluate correctly. But 2--2 does.
Made some tweaks to variables to fix other issues. Added more test
cases.