Extract expression code into new file
Cleaned up ExpressionEvaluator usage a bit. Maybe.