Move dist macro logic to the tagger.