Enhance the block and inline macro to accept a body

Which is inserted instead of the plain <apply-templates>. The default
remains <apply-templates>.