Small refactoring in Bass Service.