Improved formula building code.