Streamline bootstrapping slightly