Use tree_set_value in aug_cp
Fix move/copy