Fix handling of comment so lone comment is returned

This has been fixed for both defun and defmacro. Note for match case
the comment is always been removed for there should follow clauses.