Id macro can generate invalid XHTML

For example the TOC macro inserts Id macro before headers (H1-H6 elements) and this generates a A element which is invalid in this location.