Restructure address handling to remove possibility of invalid address strings