Work on making the dbApi sane.