Rename percentage macro to ifN
And start to use it where the pattern is needed