Refactor address normalization, eliminating an edge case bug