Here is another cleanup of some buffer-related
code designed with the help from this nice tool.

Dmitry