extended 2-fields macro usage to number arguments
extended 2-fields macro usage to number arguments

leading to further simplications

Cyan4973/zstd,Cyan4973/zstd,Cyan4973/zstd,Cyan4973/zstd,Cyan4973/zstd