[REF] Further cleanup on address handling in merge code.

This is a follow on from https://github.com/civicrm/civicrm-core/pull/15949

This doesn't make any change - it just improves legibility