Fixup for my BaseSphere split changes.