Don’t duplicate bootstrap tools unpacking logic unnecessarily, and also test building bootstrap tools more accurately!