SI-7157 fixes the arg <-> params conformance check in macros

@paulp was right. We should abstract this away, otherwise it's too easy
to make a mistake.