CharBaseBSB minor cleanup