It would be great if text could be selected and then number the headings in the selection. This is a more specific solution than issue #3.
It would work the same way as selecting h1 / paragraph / etc.
This would render the macro unnecessary solving a lot of other problems on the go. These problem include: diffs that contain all of the macro content / nicer usability experience / better section handling / etc.