Getting ready to implement #47.
more multi-db improvements.