Revert "Move + tags"

This reverts commit ca74b668b699541806c00c80738f2d74ef3dc8a2.
Revert "Wrap macros with + tags"

This reverts commit 38748c4c814b89a7e3412a74b72ce47a0d0b85f4.