cleaned up ExpressionExecutor code, hope I didn't break anything