Fewer dependencies between bootstraps

Letting keygen do its own work; requires extra password.