Re-factoring the MERGE statement in TableDefPersist