Modified defun and defmacro to return the name of the function/macro.