Use a method rather than the class type to signal resolution is complete
Code reformatting
Rename group_mismatch_resolver to mismatch_resolver, as it's just as clear and more consistent (it was called both things in some places previously