Minor restructuring of struct ModifyTable
Remove final references to 'upsert' nodes