U.S. and Mexico Tentatively Set to Replace NAFTA With New Deal