Update formatter to use last BBM helpers

Be sure to update BBM!