Expressions: Simplify expression parsing, pass variables into "expr-eval"

[gkjohnson]

Expr-eval's parse function supports taking variables. Instead of replacing variables ahead of time we should pass the table of variables into the parse function.

Related to #57, #49