etcdserver: remove unnecessary indirection