Get rid of CONF_LEAF and CONF_HUB, and follow up with code cleanups.