Simplify listener
Match changes to the etcd client API