In reply to MutterBreath.

I do both depending on which is more appropriate for the situation. I prefer that so I'm not littering client sites with shortcodes that may end up orphaned one day when (not if) the plugin/theme is eventually replaced.