Fix for intermittent failure for multi term expressions. The cause is…

… Dictionary is not Ordered and Terms must be evaluated in insertion order.

Solver: correct a function name (NFC)

Rename `optimize_` to `optimize`.