Cleaned up definition of DEFUN.
Cleaned up definition of DEFMACRO.