Finish getting rid of echelon_size.