Numbering-within macros added.