Revert "Do our own parsing."

This reverts commit 3b957b17f8e71c513fe03ba55a442a08ce8bd9a3.
Export make_formula.
Revert to XML-based parsing.
Drop vstring.
We need to make formulas.
We need to pass in a formula object, not a string.