ReadBuffer_Resync() and BufferAlloc_Resync() were not materially different
from plain ReadBuffer() and BufferAlloc(), so just use the latter directly.

In the passing, also:
* rename BufferAlloc_Internal to BufferAlloc_common, like it's called in
  newer upstream versions.
* revert some spurious whitespace and comment differences vs. upstream.