What Remains of Cross-Country Convergence?