Move dist macro logic to the tagger.
Merge branch 'pulp-2.1'