Major work combining sbufl and sbuf now done. More stuff is probably
broken.