Remove more evals

Remove more evals uncovered in #862, one of these is contentious.