Overhaul address classification.