Minor ZeroConfig refactorings

Change-Id: I78a423f0be0e750d2c16fee75628722f6353b925