As the code in BucketCatalog has evolved, some of the assumptions that guided initial implementation no longer hold, and that has lead to a patchwork of messy additions to compensate. This code could be refactored to simplify the implementation before the component gets too entrenched with the 5.0 release.