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

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