Minor code reorganization. Continuation of work on bbusd.