Removed distinction between delegate-eval and delegate