The format has reverted to its traditional form after royal parts of Donald Trump’s state visit were confined to the Windsor estate.