etcdserver: simplify non/streaming handling