Remove superfluous macro variants, disambiguate URL params