am dc999df9: Merge "More fixed-length buffer removal."

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