@benbjohnson BTW, the commented codes part already get merged at https://github.com/coreos/etcd/commit/b0793e2dd9de1ea4b99e4cf01d371a8859af5a2c

I need to finish the `watcher` part for the refactored codes.