Update to work with shard 2.0

Some changes to bootstrapping internals. No changes to external interfaces.