am 613584a2: am 81fa3039: Merge "Remove yet more fixed-length buffers (and their overruns)."

* commit '613584a24bde3adbbc7ff003eb58328387ffb7c3':
  Remove yet more fixed-length buffers (and their overruns).