Minor refactoring of ContainerRegistry.