Refactoring to eliminate last actual BDB dep from all but tests