Bugfix: Avoid some crashes in EvalManager by removing some special casing.