Fixed the parser to allow it to build evaluation trees with functions embedded.