Fixed parser and evaluator to use references and recursive token expressions