Replaced last eval(). Allowing function calls in expressions.