More DBI refactoring.
More DBI refactoring.