cleaned up SQLFormulaParser::makeFormulaElementFromPendingWord()
with makeFormulaVariableOrValue() that had been added in
the previous patch.