The likelihood of an all-out trade war may have receded but not the trade-related volatility as stocks climbed.