move more bootstrap lemmas to earlier theories