...
More conversions to try to isolate remaining BDB deps