HCOLL-77 refactors around the bootstrapping