On diameter controls and smooth convergence away from singularities