Untangling location-based pay in a location-independent future