Improve converge for query proto conversions.