These facts can be generated in defaults with a performance
boost.

Also cleaned up duplicate etcd var names.