WTO less downbeat on trade for 2020, more muted for 2021