Now using a tree-based multi-pass parser for expressions.
Fixing expression parsing.