Replaced two eval calls that were not necessary.