scansbr: Further refactoring.