Here are the same changes adapted for master, where we can put the
new 'setvbuf' method where it belongs: in the PTOB.

Comments and suggestions welcome.

     Mark