Fix problems in DPA_Merge exposed by previous code cleanup.

2 files changed