Minimal changes in eval, really..