ZEN-8711: Column arranging works much faster.