Moar bootstrap safety and idempotency