> It doesn't really matter, AFAIK, but BUFFERP is clearer, I think.

I can offer the attached patch.

martin