Improve constant values for the evaluation