am 28d5d2b1: am f1a58f8f: More fixed-length buffer removal.

* commit '28d5d2b181af5f5de6ce1448e043f1841aed164b':
  More fixed-length buffer removal.