remove unnecessary uses of eval

There are easier ways to do everything that was being done with eval.
2 files changed