Some SBARINFO cleanup/tweaking