Merge the expressions parser from xhonzyn