[cleanup] Leftovers for array refactoring (#2223)