I'm comfortable being fairly aggressive in removing address data from potential "store in store" Starbucks locations since it was flagged to me as being more prone to error than normal store data. But I'm happy to restore some of it if you all can articulate a better way for me to identify these "store in store" objects than the `branch` tag method I used for this changeset!