Fixing bugs relating to expression parsing, operator handling.