Improved matching of @(*) to not break attribute matching