Added eval-expression and eval-defun with proper behavior