The rebuildIndexesOnCollection() function in the repair_database library still constructs the Collection class when rebuilding indexes in a collection here:
Delegating this construction call to one of the catalog interfaces such as DatabaseHolder will enable us to unshim the Collection class eventually.