Fixed methodcall highlighting and return EvalTree origExpr