rbuf, tools: clean up rbuf usage.