am f1a58f8f: More fixed-length buffer removal.

* commit 'f1a58f8f33509201cabe71c6a9d01aa6b8f99966':
  More fixed-length buffer removal.