Trump’s Tariff Plans Take Shape