Brought libsbt into line with psp-std changes.

Lots of cleanup yet remains.

This is libsbt 0.4.9.