Add missing match groups

Regression from b011d49