Make bootstrapper bootstrapper less clever