Make address_for() more like label_for(), add tests