diff --git a/core/database.c b/core/database.c
index a2e08855..162edb4d 100644
--- a/core/database.c
+++ b/core/database.c
@@ -55,8 +55,6 @@ static void __dbe_setup(struct database *db, unsigned int index)
 		dbe->dbe_key   = db->db_ops->dbe_key(dbe);
 		g_hash_table_insert(db->db_keys, dbe->dbe_key, dbe);
 		db->db_size++;
-		if (db->db_ops->dbe_setup)
-			db->db_ops->dbe_setup(dbe);
 	}
 }
 
diff --git a/core/tags/album.c b/core/tags/album.c
index 6b1ec37c..6d23d1c2 100644
--- a/core/tags/album.c
+++ b/core/tags/album.c
@@ -278,12 +278,11 @@ static void album_write(struct file *file, struct db_entry *dbe)
 
 
 static const struct db_ops album_ops = {
-	album_alloc,
-	album_free,
-	album_key,
-	album_read,
-	NULL,
-	album_write,
+	.dbe_alloc = album_alloc,
+	.dbe_free  = album_free,
+	.dbe_key   = album_key,
+	.dbe_read  = album_read,
+	.dbe_write = album_write,
 };
 
 
diff --git a/core/tags/artist.c b/core/tags/artist.c
index 1d1165f0..c42bbbe5 100644
--- a/core/tags/artist.c
+++ b/core/tags/artist.c
@@ -49,12 +49,11 @@ static void artist_write(struct file *file, struct db_entry *dbe)
 
 
 static const struct db_ops artist_ops = {
-	artist_alloc,
-	artist_free,
-	artist_key,
-	artist_read,
-	NULL,
-	artist_write,
+	.dbe_alloc = artist_alloc,
+	.dbe_free  = artist_free,
+	.dbe_key   = artist_key,
+	.dbe_read  = artist_read,
+	.dbe_write = artist_write,
 };
 
 
diff --git a/core/tags/genre.c b/core/tags/genre.c
index 3a40d80a..9991fd0d 100644
--- a/core/tags/genre.c
+++ b/core/tags/genre.c
@@ -47,12 +47,11 @@ static void genre_write(struct file *file, struct db_entry *dbe)
 
 
 static const struct db_ops genre_ops = {
-	genre_alloc,
-	genre_free,
-	genre_key,
-	genre_read,
-	NULL,
-	genre_write,
+	.dbe_alloc = genre_alloc,
+	.dbe_free  = genre_free,
+	.dbe_key   = genre_key,
+	.dbe_read  = genre_read,
+	.dbe_write = genre_write,
 };
 
 
diff --git a/core/tags/library.c b/core/tags/library.c
index e3099ac3..d09f2e24 100644
--- a/core/tags/library.c
+++ b/core/tags/library.c
@@ -51,12 +51,11 @@ static void library_write(struct file *file, struct db_entry *dbe)
 
 
 static const struct db_ops library_ops = {
-	library_alloc,
-	library_free,
-	library_key,
-	library_read,
-	NULL,
-	library_write,
+	.dbe_alloc = library_alloc,
+	.dbe_free  = library_free,
+	.dbe_key   = library_key,
+	.dbe_read  = library_read,
+	.dbe_write = library_write,
 };
 
 
diff --git a/core/tags/track.c b/core/tags/track.c
index dbeb3062..cba450dd 100644
--- a/core/tags/track.c
+++ b/core/tags/track.c
@@ -106,10 +106,6 @@ static void track_free(struct db_entry *dbe)
 	g_free(track);
 }
 
-static void track_setup(struct db_entry *dbe)
-{
-}
-
 static gchar *track_key(struct db_entry *dbe)
 {
 	return TRACK(dbe)->tr_path;
@@ -185,12 +181,11 @@ static void track_write(struct file *file, struct db_entry *dbe)
 
 
 static const struct db_ops track_ops = {
-	track_alloc,
-	track_free,
-	track_key,
-	track_read,
-	track_setup,
-	track_write,
+	.dbe_alloc = track_alloc,
+	.dbe_free  = track_free,
+	.dbe_key   = track_key,
+	.dbe_read  = track_read,
+	.dbe_write = track_write,
 };
 
 
diff --git a/include/core/database.h b/include/core/database.h
index e958c3ba..6517a3fc 100644
--- a/include/core/database.h
+++ b/include/core/database.h
@@ -59,9 +59,6 @@ struct db_ops {
 	/* Read a single struct db_entry from disk. */
 	struct db_entry *(*dbe_read)(struct file *);
 
-	/* Set up a struct db_entry after adding to the database. */
-	void (*dbe_setup)(struct db_entry *);
-
 	/* Write a single struct db_entry to disk. */
 	void (*dbe_write)(struct file *, struct db_entry *);
 };
diff --git a/tests/core/database.c b/tests/core/database.c
index 45dc3f75..c4f0fafc 100644
--- a/tests/core/database.c
+++ b/tests/core/database.c
@@ -17,7 +17,6 @@ struct int_entry {
 
 #define INT_ENTRY(dbe) ((struct int_entry *)DBE_DATA(dbe))
 static unsigned int test_free_count = 0;
-static unsigned int test_setup_count = 0;
 
 static struct int_entry *__int_alloc(unsigned int val)
 {
@@ -52,11 +51,6 @@ static struct db_entry *int_read(struct file *f)
 	return &__int_alloc(val)->ie_dbe;
 }
 
-static void int_setup(struct db_entry *dbe)
-{
-	test_setup_count++;
-}
-
 static void int_write(struct file *file, struct db_entry *dbe)
 {
 	file_writef(file, "%u", INT_ENTRY(dbe)->ie_val);
@@ -67,7 +61,6 @@ static const struct db_ops int_ops = {
 	.dbe_free  = int_free,
 	.dbe_key   = int_key,
 	.dbe_read  = int_read,
-	.dbe_setup = int_setup,
 	.dbe_write = int_write,
 };
 
@@ -95,11 +88,9 @@ static void test_db_entry()
 	ent = INT_ENTRY(int_ops.dbe_read(&f));
 	file_close(&f);
 
-	int_ops.dbe_setup(&ent->ie_dbe);
 	g_assert(ent->ie_dbe.dbe_data == ent);
 	g_assert_cmpuint(ent->ie_val, ==,  1);
 	g_assert_cmpstr_free(int_ops.dbe_key(&ent->ie_dbe), ==, "1");
-	g_assert_cmpuint(test_setup_count, ==, 1);
 
 	int_ops.dbe_free(&ent->ie_dbe);
 	g_assert_cmpuint(test_free_count, ==, 2);
@@ -132,7 +123,6 @@ static void test_database(gconstpointer arg)
 	rmv.ie_val = 42;
 	rmv.ie_dbe.dbe_index = 0;
 	test_free_count  = 0;
-	test_setup_count = 0;
 
 	/* db_insert() */
 	for (i = 0; i < N; i++) {
@@ -149,7 +139,6 @@ static void test_database(gconstpointer arg)
 	g_assert_null(dbe);
 	g_assert_cmpuint(db.db_size, ==, N);
 	g_assert_cmpuint(db_actual_size(&db), ==, N);
-	g_assert_cmpuint(test_setup_count, ==, N);
 
 	/* db_at() */
 	for (i = 0; i < N; i++) {
@@ -273,10 +262,8 @@ static void test_save_load()
 	db_deinit(&db2);
 	db2.db_entries = g_ptr_array_new();
 	db2.db_keys    = g_hash_table_new(g_str_hash, g_str_equal);
-	test_setup_count = 0;
 	db_load(&db2);
 	g_assert_cmpuint(db2.db_size, ==, N / 2);
-	g_assert_cmpuint(test_setup_count, ==, N / 2);
 
 	i = 1;
 	db_for_each(dbe, next, &db2) {
diff --git a/tests/core/tags/track.c b/tests/core/tags/track.c
index f1b53deb..62bed624 100644
--- a/tests/core/tags/track.c
+++ b/tests/core/tags/track.c
@@ -82,7 +82,6 @@ static void test_track()
 	track = test_alloc("0/Hyrule Symphony/01 - Title Theme.ogg");
 	g_assert_nonnull(track);
 	track->tr_dbe.dbe_index = 0;
-	track_ops->dbe_setup(&track->tr_dbe);
 	test_verify_track(track);
 
 	g_assert_true( track_match_token(track, "title"));
@@ -101,7 +100,6 @@ static void test_track()
 	file_open(&f, OPEN_READ);
 	track = TRACK(track_ops->dbe_read(&f));
 	track->tr_dbe.dbe_index = 0;
-	track_ops->dbe_setup(&track->tr_dbe);
 	test_verify_notrack(track);
 
 	g_free(track->tr_path);
@@ -109,7 +107,6 @@ static void test_track()
 
 	track = TRACK(track_ops->dbe_read(&f));
 	track->tr_dbe.dbe_index = 0;
-	track_ops->dbe_setup(&track->tr_dbe);
 	test_verify_track(track);
 	file_close(&f);