Accommodate changes in go-etcd