Comment 1 for bug 265585

Your second point is a good one, and this is fixed in MM2.1.

For the first point, it's difficult to accomplish given the
rather inflexible templating system used in MM2.0 and 2.1.
It's likely that a post-MM2.1 release will have a better
template system where this would be possible.

Closing as fixed (even though it's only 1/2 fixed.)