Trump’s big reorg plan gets a second and third look