Further tweaked the new address-entry widget factory