We should allow the option to format the Expand Macro's title such that it can be for example: a heading. This will allow us to anchor link to the macro easily. Example:

h2. {expand:title=Click here to see the text...}
This text block will expand and collapse.
{expand}

This is not possible currently, but gives an idea of what we're trying to accomplish here.