Merge "database: Small DB class cleanups"