modified expression parser to use new parsing functions