** Macrofied all tags, finally
More macrofication done