Move AddressBuilder from inner class to top level.