Replace direct uses of ArrayVec by struct Buffer

Replace direct uses of ArrayVec by struct Buffer #1622