Query optimizations

There were a few bugs causing DNS queries to make etcd queries that weren't required.
Hah. Great example of how strong-typing and compile-time checks don't _always_ save you