ShardRegistry should have no methods that take a std::string and return a Shard. The methods should take HostAndPort, ShardId (no longer a string typedef) and (if needed) ConnectionString or a new ReplSetName type.