Move grouping/instantiation lookup code

No match.