More work on FormulaParser