Upgrade macro to also have a tag, and minor formatting changes.