Added constant evaluation step.