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