Duplicating the architecture tag handling logic was afwul
indeed; one-liner (well, two lines for readability) is not
that bad at least, factoring it out wouldn't gain a lot.

Fixes: 75735473