Make BAPS driver compliant with recent refactorings.