the db functions are different, too, but yes, they ought to be collapsed