In Solver.__init__, modified the code that subsitutes expression names
with the expanded expressions to include parentheses around the expanded
expression. This is very important if the expression involves addition
or substraction of multiple values.