A lot of work on the expression parser.