more cleanup in eval.c