By cleaning up a single deprecated method (which happens to be an SPI) I could narrow down the scope of BootstrapContext a bit more.