o Code simplification and refactoring:
    - Split the portions of the buffer.c module that handle particular
      protocols into separate modules. Part of ticket 23149.