Cleanup to remove unnecessary copies of address info.