May have fixed the aforementioned Address sorting issue. Crossing
fingers.