Simplifying Eval to remove some unused code.