Update both evaluateExpression methods with poor man's history